diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2019-01-09 10:48:42 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2019-01-09 10:52:41 +0200 |
| commit | 0e289672503a4e1599ef826d49f2fa5575081942 (patch) | |
| tree | cdaec28207956090b7cebff805135754dcb22f06 /gnu/packages/wine.scm | |
| parent | 0109b89c5834b5374f248dc3681702180013f41f (diff) | |
| parent | 6df4d8338d2bf94ab729e3b12e42ace0a06687ae (diff) | |
| download | guix-0e289672503a4e1599ef826d49f2fa5575081942.tar.gz | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'gnu/packages/wine.scm')
| -rw-r--r-- | gnu/packages/wine.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index f56699f8c9..17e0b853e0 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014, 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> +;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; @@ -225,7 +225,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "4.0-rc3") + (version "4.0-rc5") (source (origin (method git-fetch) @@ -235,7 +235,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "1yx758mv605w2g7f9aj4xf09p8q5dvbf6b9h1kdvsyhm8bkrgx66")))) + "0smp6ngs77vk1yg0saavhhn7kmi9ri8y8gc3vcgg837ycwg5i5qb")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -281,8 +281,9 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "176cdnznbk3pikh87j5q4cjb7rky5dxikf1nr0mp8a9cycycxr7w")))) + "0nx5ahahfnmimd2b7zh2wx36b877vad10i2kr2zib9m9b2w8wyfd")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf + ("ffmpeg" ,ffmpeg) ("gtk+" ,gtk+) ("libva" ,libva) ("python" ,python) |