diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-02-27 08:52:23 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-02-27 08:52:23 -0500 |
| commit | 048ec1a8b092a87de08bfe410be65642522b63ed (patch) | |
| tree | 1279c4fa3fd09805dbfe06be3514879aa38d503e /gnu/packages/wine.scm | |
| parent | fe5f687284889eeff3c1b73edab0aa26e58c3bc5 (diff) | |
| parent | b35461748b20d0172744974b39e7d9d033400c51 (diff) | |
| download | guix-048ec1a8b092a87de08bfe410be65642522b63ed.tar guix-048ec1a8b092a87de08bfe410be65642522b63ed.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/wine.scm')
| -rw-r--r-- | gnu/packages/wine.scm | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 4c7e7a4596..54cb65503c 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015 Sou Bunnbu <iyzsong@gmail.com> +;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages audio) @@ -50,18 +52,15 @@ (define-public wine (package (name "wine") - (version "1.7.52") + (version "1.9.4") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/wine/" - name "-" version ".tar.bz2")) + (uri (string-append "https://dl.winehq.org/wine/source/" + (version-major+minor version) + "/wine-" version ".tar.bz2")) (sha256 (base32 - "0jsm1p7zwhfb5fpp0xd39vnx9m98kqgfng1q9kdj70rm1hmb6wq7")) - (modules '((guix build utils))) - (snippet - '(substitute* "Make.vars.in" - (("/bin/sh") "@SHELL@"))))) + "1f5v1gns0xs512a6ym785cn29j8dxdbnxnvkg8v0p1w0p6vfmhbm")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gnu-gettext) @@ -114,6 +113,9 @@ #:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) + #:make-flags + (list "SHELL=bash") + #:phases (alist-cons-after 'configure 'patch-dlopen-paths |