From bcf2f79c06e9c9ddc32af3ef2af468209dd9a634 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Jan 2021 10:22:35 +0100 Subject: gnu: xsettingsd: Update to 1.0.2. * gnu/packages/xdisorg.scm (xsettingsd): Update to 1.0.2. --- gnu/packages/xdisorg.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/xdisorg.scm') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 793150cc5f..26660b8bfa 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2265,7 +2265,7 @@ Xwrits hides itself until you should take another break.") (define-public xsettingsd (package (name "xsettingsd") - (version "1.0.0") + (version "1.0.2") (source (origin (method git-fetch) @@ -2274,8 +2274,7 @@ Xwrits hides itself until you should take another break.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "05m4jlw0mgwp24cvyklncpziq1prr2lg0cq9c055sh4n9d93d07v")))) + (base32 "14gnkz18dipsa2v24f4nm9syxaa7g21iqjm7y65jn849ka2jr1h8")))) (build-system scons-build-system) (inputs `(("libx11" ,libx11))) -- cgit v1.2.3 From b230a47fdbd340bc3ee9d991abb4acc52ca30eb4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Feb 2021 15:26:51 +0100 Subject: gnu: xbindkey: Order inputs alphabetically. * gnu/packages/xdisorg.scm (xbindkeys)[inputs]: Swap them. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xdisorg.scm') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 79ba61b344..92f9c565b1 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -957,8 +957,8 @@ transparent text on your screen.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("libx11" ,libx11) - ("guile" ,guile-2.2))) + `(("guile" ,guile-2.2) + ("libx11" ,libx11))) (home-page "https://www.nongnu.org/xbindkeys/") (synopsis "Associate a combination of keys with a shell command") (description -- cgit v1.2.3 From a6e47aaa9feb2a3cc59bd25d7839f67caada5d35 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Feb 2021 15:32:59 +0100 Subject: Order (gnu packages xdisorg) module imports more alphabetically. * gnu/packages/xdisorg.scm: Somewhat sort the module imports. --- gnu/packages/xdisorg.scm | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'gnu/packages/xdisorg.scm') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 92f9c565b1..26f60a31a4 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -60,54 +60,54 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages xdisorg) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix hg-download) - #:use-module (guix utils) #:use-module (guix build-system cmake) - #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix build-system scons) - #:use-module (gnu packages) - #:use-module (gnu packages documentation) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix hg-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) #:use-module (gnu packages admin) - #:use-module (gnu packages base) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages compression) - #:use-module (gnu packages image) - #:use-module (gnu packages pkg-config) + #:use-module (gnu packages documentation) #:use-module (gnu packages flex) + #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gtk) + #:use-module (gnu packages guile) #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages icu4c) + #:use-module (gnu packages image) + #:use-module (gnu packages linux) + #:use-module (gnu packages m4) #:use-module (gnu packages man) #:use-module (gnu packages maths) - #:use-module (gnu packages m4) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) - #:use-module (gnu packages linux) - #:use-module (gnu packages gl) - #:use-module (gnu packages guile) - #:use-module (gnu packages xml) - #:use-module (gnu packages gtk) #:use-module (gnu packages qt) - #:use-module (gnu packages xorg) - #:use-module (gnu packages fontutils) - #:use-module (gnu packages bison) #:use-module (gnu packages sphinx) + #:use-module (gnu packages xml) + #:use-module (gnu packages xorg) + #:use-module (gnu packages) #:use-module (ice-9 match)) ;; packages outside the x.org system proper -- cgit v1.2.3 From 72fabd8d6ef7fbfd19c1f1ef294b26e3c5a16bbf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Feb 2021 15:39:02 +0100 Subject: gnu: xbindkeys: Refer to tk's wish interpreter. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * 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(-) (limited to 'gnu/packages/xdisorg.scm') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 26f60a31a4..4d1dc8391c 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 -- cgit v1.2.3 From 2c9d481c9098e18accd179f11edc1164e75f228e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Feb 2021 15:47:21 +0100 Subject: gnu: xbindkeys: Refer to xbindkeys in xbindkeys_show. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xdisorg.scm (xbindkeys)[arguments]: Add a ‘patch-references’ phase. --- gnu/packages/xdisorg.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/xdisorg.scm') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 4d1dc8391c..6b4d3f4a8a 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -965,7 +965,14 @@ transparent text on your screen.") (substitute* "xbindkeys_show" (("^#!.*|^exec wish.*") "") (("^# \\\\") (string-append "#!" (which "wish")))) - #t))))) + #t)) + (add-after 'unpack 'patch-references + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "xbindkeys_show" + (("\"(xbindkeys)\"" _ command) + (format #f "\"~a/bin/~a\"" out command))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3