diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2021-12-17 22:19:17 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2021-12-23 20:27:46 +0100 |
| commit | 5c27e1f8a045cd28ad814e6df85a04b73120bcff (patch) | |
| tree | a7c10f83ab534596c2e14e75ab00ffc627e6dfff | |
| parent | c2f80a61c1b361160cce118204222416f9b1beb2 (diff) | |
| download | guix-5c27e1f8a045cd28ad814e6df85a04b73120bcff.tar guix-5c27e1f8a045cd28ad814e6df85a04b73120bcff.tar.gz | |
gnu: icedtea-7: Bind INPUTS in 'patch-paths build phase.
* gnu/packages/java.scm (icedtea-7)[arguments]: Bind INPUTS in 'patch-paths
build phase to remove references to %build-inputs.
| -rw-r--r-- | gnu/packages/java.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index be95299905..46892ce3be 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1413,18 +1413,18 @@ bootstrapping purposes.") "/include/X11/extensions")) (("\\$\\(wildcard /usr/include/X11/extensions\\)\\)") "")))) (add-after 'unpack 'patch-paths - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) ;; buildtree.make generates shell scripts, so we need to replace ;; the generated shebang (substitute* '("openjdk.src/hotspot/make/linux/makefiles/buildtree.make") (("/bin/sh") (which "bash"))) (let ((corebin (string-append - (assoc-ref %build-inputs "coreutils") "/bin/")) + (assoc-ref inputs "coreutils") "/bin/")) (binbin (string-append - (assoc-ref %build-inputs "binutils") "/bin/")) + (assoc-ref inputs "binutils") "/bin/")) (grepbin (string-append - (assoc-ref %build-inputs "grep") "/bin/"))) + (assoc-ref inputs "grep") "/bin/"))) (substitute* '("openjdk.src/jdk/make/common/shared/Defs-linux.gmk" "openjdk.src/corba/make/common/shared/Defs-linux.gmk") (("UNIXCOMMAND_PATH = /bin/") @@ -1435,7 +1435,7 @@ bootstrapping purposes.") (string-append "DEVTOOLS_PATH = " corebin)) (("COMPILER_PATH *= */usr/bin/") (string-append "COMPILER_PATH = " - (assoc-ref %build-inputs "gcc") "/bin/")) + (assoc-ref inputs "gcc") "/bin/")) (("DEF_OBJCOPY *=.*objcopy") (string-append "DEF_OBJCOPY = " (which "objcopy")))) @@ -1443,7 +1443,7 @@ bootstrapping purposes.") (substitute* "openjdk.src/jdk/make/common/shared/Sanity.gmk" (("ALSA_INCLUDE=/usr/include/alsa/version.h") (string-append "ALSA_INCLUDE=" - (assoc-ref %build-inputs "alsa-lib") + (assoc-ref inputs "alsa-lib") "/include/alsa/version.h"))) ;; fix hard-coded utility paths |