diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-01-20 22:12:10 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-01-20 22:12:10 +0100 |
| commit | 3e2d4e69c340c3520f546f8c7e21e52383058d1c (patch) | |
| tree | 0bc92edb753cfdf9a9e7ef763ebc19f0cd2d528c /gnu/packages/emulators.scm | |
| parent | ad79ae7e2d7505292b11e87302b08f4db0f934e9 (diff) | |
| parent | e5ad2cdf172eecc7edef37a500593b1941af013c (diff) | |
| download | guix-3e2d4e69c340c3520f546f8c7e21e52383058d1c.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/emulators.scm')
| -rw-r--r-- | gnu/packages/emulators.scm | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 2d21f1246a..9a0d1e9b17 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> +;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,7 +41,6 @@ #:use-module (gnu packages backup) #:use-module (gnu packages compression) #:use-module (gnu packages curl) - #:use-module (gnu packages databases) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) @@ -65,8 +64,10 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) + #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) @@ -237,26 +238,23 @@ turbo speed, networked multiplayer, and graphical enhancements.") (define-public dosbox (package (name "dosbox") - (version "0.74.svn3947") + (version "0.74-2") (source (origin - (method svn-fetch) - (uri (svn-reference - (url "http://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk/") - (revision 3947))) - (file-name (string-append name "-" version "-checkout")) - ;; Use SVN head, since the last release (2010) is incompatible - ;; with GCC 4.8+ (see - ;; <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624976>). + (method url-fetch) + (uri (string-append "https://sourceforge.net/projects/dosbox" + "/files/dosbox/" version "/dosbox-" + version ".tar.gz/download")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1p918j6090d1nkvgq7ifvmn506zrdmyi32y7p3ms40d5ssqjg8fj")))) + "1ksp1b5szi0vy4x55rm3j1y9wq5mlslpy8llpg87rpdyjlsk0xvh")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases (add-after 'unpack 'autogen.sh (lambda _ - (zero? (system* "sh" "autogen.sh"))))))) + (invoke "sh" "autogen.sh")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake))) |