diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2020-08-04 10:07:47 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2020-08-04 10:30:31 +0300 |
| commit | 7f101e7ceb869882b9a959cb7801aea64c26704d (patch) | |
| tree | 4bb946fa8e9b3f7564c8df65c15667fab2e1f04f /gnu/packages/xdisorg.scm | |
| parent | a5b44d999f26828932be910f6b8113608b6e266c (diff) | |
| download | guix-patches-7f101e7ceb869882b9a959cb7801aea64c26704d.tar guix-patches-7f101e7ceb869882b9a959cb7801aea64c26704d.tar.gz | |
gnu: catch-framework2: Update to 2.13.0.
* gnu/packages/check.scm (catch-framework2): Update to 2.13.0.
* gnu/packages/engineering.scm (libfive)[arguments]: Adjust custom
'find-catch phase for updated include path.
* gnu/packages/xdisorg.scm (j4-dmenu-desktop)[arguments]: Add custom
'find-catch phase to search for updated catch2 include directory.
Diffstat (limited to 'gnu/packages/xdisorg.scm')
| -rw-r--r-- | gnu/packages/xdisorg.scm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 20702c3a4f..3baeea32df 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> @@ -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")))))) |