diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2019-12-19 09:06:14 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2019-12-19 09:06:58 +0200 |
commit | 4176300804a50d0a1a118ff2ff8b33118dc5b0a1 (patch) | |
tree | 0cc838c80fc4a40e92baba61cae2adbd45aae86e | |
parent | 0b2a004598037c297282520997ede523543136b9 (diff) | |
download | guix-4176300804a50d0a1a118ff2ff8b33118dc5b0a1.tar.gz guix-4176300804a50d0a1a118ff2ff8b33118dc5b0a1.zip |
gnu: icedtea@2: Fix missing match catch-all.
* gnu/packages/java.scm (icedtea@2)[arguments]: In custom
'install-libjvm phase add catch-all case to 'match'.
-rw-r--r-- | gnu/packages/java.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d0e3fd8d33..c4cbcbdc1b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1430,7 +1430,14 @@ bootstrapping purposes.") ("armhf-linux" "/lib/arm") ("aarch64-linux" - "/lib/aarch64"))))) + "/lib/aarch64") + ;; We need a catch-all, dropping + ;; '-linux' works in most cases. + (_ + (string-append + "/lib/" + (string-drop-right + (%current-system) 6))))))) (symlink (string-append lib-path "/server/libjvm.so") (string-append lib-path "/libjvm.so"))) #t)) |