From: "Ignas Lapėnas" <ignas@lapenas.dev>
To: 69743@debbugs.gnu.org
Cc: "Ignas Lapėnas" <ignas@lapenas.dev>
Subject: [bug#69743] [PATCH] update grimshot package definition
Date: Tue, 12 Mar 2024 16:26:51 +0200 [thread overview]
Message-ID: <3e0169510de5f325bc1834b87fe9d1514d72e84e.1710253611.git.ignas@lapenas.dev> (raw)
In-Reply-To: <7f2ba732c3b7dd12d937e70a5f643a09ac5bfa6d.1710237367.git.ignas@lapenas.dev>
Issue: https://issues.guix.gnu.org/69667
Grimshot was dropped from sway.
https://github.com/swaywm/sway/issues/7405
The contrib was moved to:
https://github.com/OctopusET/sway-contrib
Package definition updated accordingly.
Change-Id: I9ed9cdf7ce10fe878b4f2b931791ed22a63ff99a
---
gnu/packages/wm.scm | 58 +++++++++++++++++++++++++--------------------
1 file changed, 32 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index edbb3096b8..bb9926d53a 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -3524,33 +3524,36 @@ (define-public avizo
(define-public grimshot
(package
- (inherit sway)
(name "grimshot")
- (source (origin
- (inherit (package-source sway))
- (snippet #~(delete-file "contrib/grimshot.1"))))
+ (version "1.9-contrib.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/OctopusET/sway-contrib")
+ (commit version)))
+ (sha256
+ (base32 "16fa8l81zjy25nsky1i525hb7zjprqz74mbirm9b76pvksschdv5"))))
(build-system copy-build-system)
(arguments
- (list #:install-plan #~`(("grimshot" "bin/")
- ("grimshot.1" "share/man/man1/"))
- #:phases #~(modify-phases %standard-phases
- (add-after 'unpack 'chdir
- (lambda _
- (chdir "contrib")))
- (add-after 'chdir 'patch-script-dependencies
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "grimshot"
- (("\\b(date|grim|jq|notify-send|slurp|swaymsg|wl-copy)\\b"
- _ binary)
- (search-input-file
- inputs (string-append "bin/" binary))))))
- (add-after 'patch-script-dependencies 'build-man-page
- (lambda _
- (with-input-from-file "grimshot.1.scd"
- (lambda _
- (with-output-to-file "grimshot.1"
- (lambda _
- (invoke "scdoc"))))))))))
+ (list
+ #:install-plan #~`(("grimshot" "bin/")
+ ("grimshot.1" "share/man/man1/"))
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-script-dependencies
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "grimshot"
+ (("\\b(date|grim|jq|notify-send|slurp|swaymsg|wl-copy)\\b"
+ _ binary)
+ (search-input-file inputs
+ (string-append "bin/" binary))))))
+ (add-after 'patch-script-dependencies 'build-man-page
+ (lambda _
+ (with-input-from-file "grimshot.1.scd"
+ (lambda _
+ (with-output-to-file "grimshot.1"
+ (lambda _
+ (invoke "scdoc"))))))))))
(native-inputs (list scdoc))
(inputs (list coreutils
grim
@@ -3559,11 +3562,14 @@ (define-public grimshot
slurp
sway
wl-clipboard))
+ (home-page "https://github.com/OctopusET/sway-contrib")
(synopsis "Screenshot utility for the Sway window manager")
- (description "Grimshot is a screenshot utility for @code{sway}. It provides
+ (description
+ "Grimshot is a screenshot utility for @code{sway}. It provides
an interface over @code{grim}, @code{slurp} and @code{jq}, and supports storing
the screenshot either directly to the clipboard using @code{wl-copy} or to a
-file.")))
+file.")
+ (license license:expat)))
(define-public wld
(let ((commit "6586736176ef50a88025abae835e29a7ca980126")
base-commit: 4003c60abf7a6e59e47cc2deb9eef2f104ebb994
--
2.41.0
prev parent reply other threads:[~2024-03-12 16:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-12 9:56 [bug#69743] [PATCH] update grimshot package definition Ignas Lapėnas
2024-03-12 13:29 ` Jack Hill
2024-03-12 13:33 ` Ignas Lapėnas
2024-03-12 14:28 ` Ignas Lapėnas
2024-03-12 18:13 ` Jack Hill
2024-03-21 1:38 ` bug#69743: " Jack Hill
2024-03-12 14:26 ` Ignas Lapėnas [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3e0169510de5f325bc1834b87fe9d1514d72e84e.1710253611.git.ignas@lapenas.dev \
--to=ignas@lapenas.dev \
--cc=69743@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.