From a2c694dc6d03be728ad55722bc10cb3a864f4d93 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 12 Jun 2024 13:50:01 +0200 Subject: gnu: grass: Fix build. * gnu/packages/geo.scm (grass)[arguments]: Use 'search-input-*' instead of 'assoc-ref' in 'configure' phase. Change-Id: I34de3bb219163e470561493efb5c41b6dd1e038f --- gnu/packages/geo.scm | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'gnu') 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" -- cgit v1.2.3