summary refs log tree commit diff
diff options
context:
space:
mode:
authorRutger Helling <rhelling@mykolab.com>2017-12-07 10:06:38 +0100
committerDanny Milosavljevic <dannym@scratchpost.org>2017-12-08 21:43:14 +0100
commite02693a3cb210653ce547918b5fbf3c2b5d560c1 (patch)
tree368ce416f8fb6838516212671eff5e3af8a52750
parent1aa6582ee9ffb57724ed15db7c87cd1ff868a4ef (diff)
downloadguix-e02693a3cb210653ce547918b5fbf3c2b5d560c1.tar.gz
gnu: wine64: Install libraries to /lib.
* gnu/packages/wine.scm (wine64)[arguments]: Remove inherited #:make-flags and
add new #:make-flags argument. #:configure-flags: Change LDFLAGS from /lib64
to /lib.
-rw-r--r--gnu/packages/wine.scm9
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 0598392757..b4f6573cf5 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -158,10 +158,13 @@ integrate Windows applications into your desktop.")
     (inherit wine)
     (name "wine64")
     (arguments
-     `(#:configure-flags
+     `(#:make-flags
+       (list "SHELL=bash"
+             (string-append "libdir=" %output "/lib"))
+       #:configure-flags
        (list "--enable-win64"
-             (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib64"))
-       ,@(strip-keyword-arguments '(#:configure-flags #:system)
+             (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))
+       ,@(strip-keyword-arguments '(#:configure-flags #:make-flags #:system)
                                   (package-arguments wine))))
     (synopsis "Implementation of the Windows API (64-bit version)")
     (supported-systems '("x86_64-linux" "aarch64-linux"))))