nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: icedtea-7: Fix build on i686-linux. 

* gnu/packages/java.scm (icedtea-7)[arguments]: Use "i386" lib directory when
the system is "i686-linux".
This commit is contained in:
Ricardo Wurmus 2019-10-04 10:36:29 +02:00
parent fc37b4afb2
commit 1b6f99ea53
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/java.scm
View File

@ -1376,7 +1376,12 @@ bootstrapping purposes.")
(add-after 'install 'install-libjvm (add-after 'install 'install-libjvm
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((lib-path (string-append (assoc-ref outputs "out") (let* ((lib-path (string-append (assoc-ref outputs "out")
"/lib/amd64"))) "/lib/"
,(match (%current-system)
("i686-linux"
"i386")
("x86_64-linux"
"amd64")))))
(symlink (string-append lib-path "/server/libjvm.so") (symlink (string-append lib-path "/server/libjvm.so")
(string-append lib-path "/libjvm.so"))) (string-append lib-path "/libjvm.so")))
#t)) #t))