diff options
author | Guillaume Le Vaillant <glv@posteo.net> | 2024-06-12 13:50:01 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:45:05 +0200 |
commit | a2c694dc6d03be728ad55722bc10cb3a864f4d93 (patch) | |
tree | cb89e9b66f70bdd85ca1d5adc23581c063b7846d /gnu | |
parent | 3666d531159b0c7a1ab7ddd8e882cac16982acf4 (diff) | |
download | guix-a2c694dc6d03be728ad55722bc10cb3a864f4d93.tar.gz guix-a2c694dc6d03be728ad55722bc10cb3a864f4d93.zip |
gnu: grass: Fix build.
* gnu/packages/geo.scm (grass)[arguments]: Use 'search-input-*' instead of
'assoc-ref' in 'configure' phase.
Change-Id: I34de3bb219163e470561493efb5c41b6dd1e038f
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/packages/geo.scm | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 02cb6bfd5b..0f092bcd00 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2839,26 +2839,28 @@ orienteering sport.") (assoc-ref outputs "out")) "--with-blas" "--with-bzlib" - (string-append "--with-freetype-includes=" - (assoc-ref inputs "freetype") - "/include/freetype2") - (string-append "--with-freetype-libs=" - (assoc-ref inputs "freetype") - "/lib") + (string-append + "--with-freetype-includes=" + (search-input-directory inputs "/include/freetype2")) + (string-append + "--with-freetype-libs=" + (dirname + (search-input-file inputs "/lib/libfreetype.so"))) "--with-geos" "--with-lapack" "--with-mysql" - (string-append "--with-mysql-includes=" - (assoc-ref inputs "mariadb-dev") - "/include/mysql") - (string-append "--with-mysql-libs=" - (assoc-ref inputs "mariadb-lib") - "/lib") + (string-append + "--with-mysql-includes=" + (search-input-directory inputs "/include/mysql")) + (string-append + "--with-mysql-libs=" + (dirname + (search-input-file inputs "/lib/libmariadb.so"))) "--with-netcdf" "--with-postgres" - (string-append "--with-proj-share=" - (assoc-ref inputs "proj") - "/share/proj") + (string-append + "--with-proj-share=" + (search-input-directory inputs "/share/proj")) "--with-pthread" "--with-readline" "--with-sqlite" |