gnu: wine: Update to 1.9.4.

* gnu/packages/wine.scm (wine): Update to 1.9.4.
[origin]: Remove snippet.
[arguments]: Set SHELL with make-flags.
This commit is contained in:
Ricardo Wurmus 2016-02-20 22:29:52 +01:00
parent fbc5b815cc
commit eeabe5a186

View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2014, 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -20,6 +21,7 @@ (define-module (gnu packages wine)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix utils)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages audio) #:use-module (gnu packages audio)
@ -50,18 +52,15 @@ (define-module (gnu packages wine)
(define-public wine (define-public wine
(package (package
(name "wine") (name "wine")
(version "1.7.52") (version "1.9.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/wine/" (uri (string-append "https://dl.winehq.org/wine/source/"
name "-" version ".tar.bz2")) (version-major+minor version)
"/wine-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0jsm1p7zwhfb5fpp0xd39vnx9m98kqgfng1q9kdj70rm1hmb6wq7")) "1f5v1gns0xs512a6ym785cn29j8dxdbnxnvkg8v0p1w0p6vfmhbm"))))
(modules '((guix build utils)))
(snippet
'(substitute* "Make.vars.in"
(("/bin/sh") "@SHELL@")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("gettext" ,gnu-gettext) ("gettext" ,gnu-gettext)
@ -114,6 +113,9 @@ (define-public wine
#:configure-flags #:configure-flags
(list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))
#:make-flags
(list "SHELL=bash")
#:phases #:phases
(alist-cons-after (alist-cons-after
'configure 'patch-dlopen-paths 'configure 'patch-dlopen-paths