diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-10-05 00:45:38 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-10-05 00:45:38 +0200 |
| commit | 7716ccd59c0c17f9399d73abec05001b775d100b (patch) | |
| tree | 17a3f8cc7201f9deed0b3de8d5d597b892aaede3 /gnu/packages/calendar.scm | |
| parent | 86edcc53382c66be06165c62a3934d60ae7aabd8 (diff) | |
| parent | a35532f52df3ba3bc360346938aa90806cad493e (diff) | |
| download | patches-7716ccd59c0c17f9399d73abec05001b775d100b.tar patches-7716ccd59c0c17f9399d73abec05001b775d100b.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/calendar.scm')
| -rw-r--r-- | gnu/packages/calendar.scm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index e7d21d2ce7..9a3aab33ab 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> -;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com> ;;; Copyright © 2016 Stefan Reichoer <stefan@xsteve.at> ;;; @@ -55,9 +55,8 @@ (arguments '(#:tests? #f ; test suite appears broken #:configure-flags - (list (string-append "-DCMAKE_INSTALL_RPATH=" - (assoc-ref %outputs "out") "/lib:" - (assoc-ref %outputs "out") "/lib64")) + (list (string-append "-DCMAKE_INSTALL_LIBDIR=" + (assoc-ref %outputs "out") "/lib")) #:phases (modify-phases %standard-phases (add-before 'configure 'patch-paths |