diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-01-03 19:41:05 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-03 19:41:05 +0100 |
| commit | 982eff9e841f3539e4ecf93669435a290bfde571 (patch) | |
| tree | b1e3f6fc85c6c35c264f091eb2fc5cff8514c230 /gnu/packages/java.scm | |
| parent | 7ba6d70e4528201151195e1ed2175ee4828bdb2f (diff) | |
| parent | 7158fe4ded47a599ceb8d556132ba83fcc686962 (diff) | |
| download | guix-982eff9e841f3539e4ecf93669435a290bfde571.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/java.scm')
| -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)) |