diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-09 12:22:14 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-09 12:22:14 +0200 |
| commit | 94ca5b4357af8f8921f0cb0873a7cf316f13aa69 (patch) | |
| tree | 6ef30120737f26f298f7f17d86597b0b729517e0 /gnu/packages/emulators.scm | |
| parent | 6750c114e3e988249f4069d0180316c6d0192350 (diff) | |
| parent | db61bdd7f52270a35bd0a3a88650d98276dab20b (diff) | |
| download | guix-94ca5b4357af8f8921f0cb0873a7cf316f13aa69.tar.gz guix-94ca5b4357af8f8921f0cb0873a7cf316f13aa69.zip | |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/emulators.scm')
| -rw-r--r-- | gnu/packages/emulators.scm | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 67950c1603..1d50c9ef01 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -60,6 +60,7 @@ #:use-module (gnu packages cdrom) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages containers) #:use-module (gnu packages cross-base) #:use-module (gnu packages curl) #:use-module (gnu packages digest) @@ -400,7 +401,7 @@ older games.") ;; This is not a patch staging area for DOSBox, but an unaffiliated fork. (package (name "dosbox-staging") - (version "0.79.1") + (version "0.80.1") (source (origin (method git-fetch) @@ -409,16 +410,14 @@ older games.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0wdnkz3djjc514hn945fr9g9mnpnvk16fan84ny9g5wxak6dvsqp")))) + (base32 "1iqqrw95lpgjbmi777jdl5z1nizxgfy8xwpmy1fasjlb2yh2kp93")))) (build-system meson-build-system) (arguments (list #:configure-flags #~(list ;; These both try to git clone subprojects. "-Dunit_tests=disabled" ; gtest - "-Duse_mt32emu=false" - ;; Not packaged. - "-Duse_slirp=false") + "-Duse_mt32emu=false") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-includes @@ -426,7 +425,7 @@ older games.") ;; This unnecessary file has an encoding error. (delete-file "./src/libs/sdlcd/macosx/SDLOSXCAGuard.h") (substitute* (find-files "." "\\.(cpp|h)") - (("^(#include <)(SDL[_.])" _ include file) + (("^(#[[:space:]]*include <)(SDL[_.])" _ include file) (string-append include "SDL2/" file)))))))) (native-inputs (list pkg-config)) @@ -435,9 +434,12 @@ older games.") fluidsynth iir libpng + libslirp mesa opusfile - (sdl-union (list sdl2 sdl2-net)) + sdl2 + sdl2-image + sdl2-net speexdsp zlib)) (home-page "https://dosbox-staging.github.io") |