diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2020-08-26 18:35:14 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2020-08-26 18:35:14 +0200 |
| commit | 17dddeeee560527a8f30d37761949d658056cb09 (patch) | |
| tree | 15b0b19c55787f556eb9b42c28d173bddc5435db /gnu/packages/xdisorg.scm | |
| parent | 331a09654eb7e9f6212b7e8469077fa7393e8b11 (diff) | |
| parent | 6a9581741e4ee81226aeb2f1c997df76670a6aab (diff) | |
| download | guix-17dddeeee560527a8f30d37761949d658056cb09.tar.gz guix-17dddeeee560527a8f30d37761949d658056cb09.zip | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/xdisorg.scm')
| -rw-r--r-- | gnu/packages/xdisorg.scm | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 20702c3a4f..5d7b39451c 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2015 Florian Paul Schmidt <mista.tapas@gmx.net> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016, 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com> @@ -934,7 +934,7 @@ Guile will work for XBindKeys.") (define-public sxhkd (package (name "sxhkd") - (version "0.6.1") + (version "0.6.2") (source (origin (method git-fetch) @@ -943,7 +943,7 @@ Guile will work for XBindKeys.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0j7bl2l06r0arrjzpz7al9j6cwzc730knbsijp7ixzz96pq7xa2h")))) + (base32 "1winwzdy9yxvxnrv8gqpigl9y0c2px27mnms62bdilp4x6llrs9r")))) (build-system gnu-build-system) (inputs `(("asciidoc" ,asciidoc) @@ -2020,7 +2020,7 @@ temperature of the screen.") "--with-xkb" "--with-default-authproto-module=/run/setuid-programs/authproto_pam"))) (native-inputs - `(("pandoc" ,ghc-pandoc) + `(("pandoc" ,pandoc) ("pkg-config" ,pkg-config))) (inputs `(("fontconfig" ,fontconfig) @@ -2470,6 +2470,11 @@ create layout indicator widgets.") `(#:configure-flags '("-DWITH_GIT_CATCH=off") #:phases (modify-phases %standard-phases + (add-after 'unpack 'find-catch + (lambda _ + (substitute* "CMakeLists.txt" + (("PATH_SUFFIXES catch") "PATH_SUFFIXES catch2")) + #t)) (replace 'check (lambda _ (invoke "./j4-dmenu-tests" "exclude:SearchPath/XDG_DATA_HOME")))))) |