[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/04: gnu: xbindkeys: Refer to tk's wish interpreter.
From: |
guix-commits |
Subject: |
03/04: gnu: xbindkeys: Refer to tk's wish interpreter. |
Date: |
Tue, 2 Feb 2021 09:51:15 -0500 (EST) |
nckx pushed a commit to branch master
in repository guix.
commit 72fabd8d6ef7fbfd19c1f1ef294b26e3c5a16bbf
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Tue Feb 2 15:39:02 2021 +0100
gnu: xbindkeys: Refer to tk's wish interpreter.
Fixes <http://issues.guix.gnu.org/46255>.
* gnu/packages/xdisorg.scm (xbindkeys)[arguments]: Add a ‘sanitise-shebang’
phase.
[inputs]: Add tk.
---
gnu/packages/xdisorg.scm | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 26f60a3..4d1dc83 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -105,6 +105,7 @@
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages sphinx)
+ #:use-module (gnu packages tcl)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module (gnu packages)
@@ -954,11 +955,23 @@ transparent text on your screen.")
(base32
"1wl2vc5alisiwyk8m07y1ryq8w3ll9ym83j27g4apm4ixjl8d6x2"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'sanitise-shebang
+ ;; This wish script uses a strange double shebang that escapes our
+ ;; patch-shebangs phase. Assume that it's unnecessary & replace it.
+ (lambda _
+ (substitute* "xbindkeys_show"
+ (("^#!.*|^exec wish.*") "")
+ (("^# \\\\") (string-append "#!" (which "wish"))))
+ #t)))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("guile" ,guile-2.2)
- ("libx11" ,libx11)))
+ ("libx11" ,libx11)
+ ("tk" ,tk)))
(home-page "https://www.nongnu.org/xbindkeys/")
(synopsis "Associate a combination of keys with a shell command")
(description