diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-12-22 15:26:30 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-12-22 15:26:30 +0100 |
| commit | f30830b2e67d973f2363903dbe5b27269da1901a (patch) | |
| tree | 851a3a361cde2e083c418c54a1932bd57096c5a0 /gnu/packages/emulators.scm | |
| parent | 34f1838f04c7c359da8dbba86817499630ce7f01 (diff) | |
| parent | 25ec3684e3529fae290d389ba11755c7e7c016ea (diff) | |
| download | guix-f30830b2e67d973f2363903dbe5b27269da1901a.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/emulators.scm')
| -rw-r--r-- | gnu/packages/emulators.scm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 795595e447..991599a394 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1186,7 +1186,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.203") + (version "0.204") (source (origin (method git-fetch) @@ -1196,7 +1196,7 @@ play them on systems for which they were never designed!") (file-name (git-file-name name version)) (sha256 (base32 - "19ccqc00024fbjyk0k5d9xljhwq7wsrp7phwm2jmn0h77mgdj844")) + "0yn63v2f1xlksfnvbxc5p5zpc7ps044m1kf69jhzbfirx953slsi")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. @@ -1223,6 +1223,14 @@ play them on systems for which they were never designed!") #:phases (modify-phases %standard-phases (delete 'configure) + ;; Prevent compilation error: ‘atan’ is not a member of ‘std’. Also + ;; fixed upstream in fec1cde5a40e197d4ed4314bf58b9e66e84e1631. + (add-after 'unpack 'fix-build + (lambda _ + (substitute* "src/mame/video/xavix.cpp" + (("#include \"logmacro.h\"") + "#include \"logmacro.h\"\n#include <cmath>")) + #t)) (add-after 'build 'build-documentation (lambda _ (invoke "make" "-C" "docs" "man" "info"))) (replace 'install |