diff options
| author | Marius Bakke <[email protected]> | 2020-02-03 15:35:51 +0100 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2020-02-03 15:35:51 +0100 |
| commit | 0a83339bb1429332ee889e9a976aa214ae2ac0db (patch) | |
| tree | 9c3d2bcbdba2c670a5f8f98d3557f0444c357327 /gnu/packages/emulators.scm | |
| parent | 20fe3cd761c286a27236d8fced4152a0ccdc547d (diff) | |
| parent | 75385105348066201ef898b934917eeb6ceab87a (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/emulators.scm')
| -rw-r--r-- | gnu/packages/emulators.scm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 23b5ad864f..284dc22039 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1234,7 +1234,8 @@ multi-system game/emulator system.") (setenv "CONFIG_SHELL" bash) (apply invoke "./configure" flags))))))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("nasm" ,nasm) + ("pkg-config" ,pkg-config))) (inputs `(("alsa-lib" ,alsa-lib) ("faad2" ,faad2) @@ -1249,7 +1250,6 @@ multi-system game/emulator system.") ("libpng" ,libpng) ("libtheora" ,libtheora) ("libvorbis" ,libvorbis) - ("nasm" ,nasm) ("sdl2" ,(sdl-union (list sdl2 sdl2-net))) ("zlib" ,zlib))) (home-page "https://www.scummvm.org/") @@ -1264,7 +1264,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.217") + (version "0.218") (source (origin (method git-fetch) @@ -1273,8 +1273,7 @@ play them on systems for which they were never designed!") (commit (apply string-append "mame" (string-split version #\.))))) (file-name (git-file-name name version)) (sha256 - (base32 - "03h4d0d8lh6djjff3zqhjm14klc9n129yzwygdqppz0f43w97cmw")) + (base32 "1c43hqfabc7spkyk5ma4bjdb0yqm93sdg5g13ka8mvi462snrfd7")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. |