[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: gnu: icedtea@2: Fix missing match catch-all.
From: |
guix-commits |
Subject: |
03/03: gnu: icedtea@2: Fix missing match catch-all. |
Date: |
Thu, 19 Dec 2019 02:13:48 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit 4176300804a50d0a1a118ff2ff8b33118dc5b0a1
Author: Efraim Flashner <address@hidden>
Date: Thu Dec 19 09:06:14 2019 +0200
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'.
---
gnu/packages/java.scm | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index d0e3fd8..c4cbcbd 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))