aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-10-12 12:46:24 +0000
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2023-02-13 16:08:11 -0500
commitfbd3565efc81f22faf9c52cb33ab0946c44682fd (patch)
treeba7224116c88e036f323de6890d0e575705afcce /gnu
parent9fd1cd442fab5e80bed33dccbbbec51c098ffc2a (diff)
downloadguix-fbd3565efc81f22faf9c52cb33ab0946c44682fd.tar
guix-fbd3565efc81f22faf9c52cb33ab0946c44682fd.tar.gz
gnu: icedove: Use more gexps.
* gnu/packages/gnuzilla.scm (icedove) [configure]: Use search-input-file and this-package-native-input.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/gnuzilla.scm10
1 files changed, 7 insertions, 3 deletions
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 @@ ca495991b7852b855"))
(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 @@ ca495991b7852b855"))
"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"