Subject: [bug#29603] [PATCH] Two patches for wine/wine64.

From: Rutger Helling <[email-masked]>
Date: Thu, 07 Dec 2017 10:23:59 +0100

Hey Guix, 

here are two patches for wine and wine64. 

The first patch adds a few more inputs to wine (and thus wine64). The
second patch makes sure wine64 installs its libraries into /lib instead
of /lib64.

From 9687611bf04787b6164384d8eb26fc06caafcebc Mon Sep 17 00:00:00 2001
From: Rutger Helling <[email-masked]>
Date: Thu, 7 Dec 2017 10:05:31 +0100
Subject: [PATCH] gnu: wine: Add more inputs.

* gnu/packages/wine.scm (wine)[inputs]: Add eudev, gst-plugins-base, libpcap and
v4l-utils.
---
 gnu/packages/wine.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index b4c3c194f..059839275 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -26,6 +26,7 @@
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
+  #:use-module (gnu packages admin)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages compression)
@@ -38,6 +39,7 @@
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
+  #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages openldap)
   #:use-module (gnu packages perl)
@@ -49,6 +51,7 @@
   #:use-module (gnu packages samba)
   #:use-module (gnu packages scanner)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages video)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg))
 
@@ -73,10 +76,12 @@
      `(("alsa-lib" ,alsa-lib)
        ("dbus" ,dbus)
        ("cups" ,cups)
+       ("eudev" ,eudev)
        ("fontconfig" ,fontconfig)
        ("freetype" ,freetype)
        ("glu" ,glu)
        ("gnutls" ,gnutls)
+       ("gst-plugins-base" ,gst-plugins-base)
        ("lcms" ,lcms)
        ("libxml2" ,libxml2)
        ("libxslt" ,libxslt)
@@ -85,6 +90,7 @@
        ("libldap" ,openldap)
        ("libnetapi" ,samba)
        ("libsane" ,sane-backends)
+       ("libpcap" ,libpcap)
        ("libpng" ,libpng)
        ("libjpeg" ,libjpeg)
        ("libtiff" ,libtiff)
@@ -102,6 +108,7 @@
        ("openal" ,openal)
        ("pulseaudio" ,pulseaudio)
        ("unixodbc" ,unixodbc)
+       ("v4l-utils" ,v4l-utils)
        ("zlib" ,zlib)))
     (arguments
      `(;; Force a 32-bit build (under the assumption that this package is
-- 
2.15.1

From 1b6fbf0607c7a6d555aa1c20c0c57ed9c3aee319 Mon Sep 17 00:00:00 2001
From: Rutger Helling <[email-masked]>
Date: Thu, 7 Dec 2017 10:06:38 +0100
Subject: [PATCH] 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.
---
 gnu/packages/wine.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 059839275..b4f6573cf 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"))))
-- 
2.15.1