From fbd3565efc81f22faf9c52cb33ab0946c44682fd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 12 Oct 2022 12:46:24 +0000 Subject: gnu: icedove: Use more gexps. * gnu/packages/gnuzilla.scm (icedove) [configure]: Use search-input-file and this-package-native-input. --- gnu/packages/gnuzilla.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 082a54abec..ef21673e2f 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1246,7 +1246,8 @@ (define-public icedove (string-drop hash 8)))))) (delete 'bootstrap) (replace 'configure - (lambda* (#:key inputs configure-flags #:allow-other-keys) + (lambda* (#:key native-inputs inputs configure-flags + #:allow-other-keys) (let* ((bash (which "bash")) (abs-srcdir (getcwd)) (srcdir (string-append "../" (basename abs-srcdir))) @@ -1298,9 +1299,12 @@ (define-public icedove "ac_add_options --enable-system-ffi\n" "ac_add_options --enable-system-pixman\n" "ac_add_options --prefix=" #$output "\n" - "ac_add_options --with-clang-path=" (assoc-ref %build-inputs "clang") "/bin/clang\n" + "ac_add_options --with-clang-path=" + (search-input-file (or native-inputs inputs) + "bin/clang") "\n" "ac_add_options --with-distribution-id=org.gnu\n" - "ac_add_options --with-libclang-path=" (assoc-ref %build-inputs "clang") "/lib\n" + "ac_add_options --with-libclang-path=" + #$(this-package-native-input "clang") "/lib\n" "ac_add_options --with-system-bz2\n" "ac_add_options --with-system-icu\n" "ac_add_options --with-system-jpeg\n" -- cgit v1.2.3