diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
| commit | 6f9a80b331ae41d142a49fbeb94b90ee587b6155 (patch) | |
| tree | 2da042a6ccf5368c73d6e3d54c2ee02a62d284e4 /gnu/packages/emulators.scm | |
| parent | 6500c9a5b364616e38a7e03aa4516fc2d7cee876 (diff) | |
| parent | dece03e2b98fc1c2428c2448ce5792f813eb79bf (diff) | |
| download | guix-6f9a80b331ae41d142a49fbeb94b90ee587b6155.tar.gz | |
Merge branch 'master' into core-updates
Note: this merge actually changes the 'curl' and 'python-attrs' derivations, as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and 12964df69a99de6190422c752fef65ef813f3b6b respectively. 4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it cannot currently be tested. Conflicts: gnu/local.mk gnu/packages/aidc.scm gnu/packages/boost.scm gnu/packages/curl.scm gnu/packages/nettle.scm gnu/packages/networking.scm gnu/packages/python-xyz.scm gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/emulators.scm')
| -rw-r--r-- | gnu/packages/emulators.scm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 9b22b56369..ca935036d4 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -276,7 +276,7 @@ SuperCPU.") ("openal" ,openal) ("pugixml" ,pugixml) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("sdl2" ,sdl2) ("sfml" ,sfml) ("soil" ,soil) @@ -376,7 +376,7 @@ older games.") #:tests? #f)) ; test suite wants mips toolchain (inputs `(("elfutils" ,elfutils) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://github.com/cvut/QtMips") (synopsis "MIPS CPU emulator") (description "This package contains a MIPS CPU emulator. The simulator @@ -620,7 +620,7 @@ The following systems are supported: ("mesa" ,mesa) ("minizip" ,minizip) ("ncurses" ,ncurses) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("sdl2" ,sdl2) ("sqlite" ,sqlite) @@ -1379,7 +1379,7 @@ as RetroArch.") ("openal" ,openal) ("pulseaudio" ,pulseaudio) ("python" ,python) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("sdl" ,sdl2) ("udev" ,eudev) ("vulkan-loader" ,vulkan-loader) @@ -1799,7 +1799,7 @@ This is a part of the TiLP project.") ("pugixml" ,pugixml) ("pulseaudio" ,pulseaudio) ("python-wrapper" ,python-wrapper) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("rapidjson" ,rapidjson) ("sdl" ,(sdl-union (list sdl2 sdl2-ttf))) ("sqlite" ,sqlite) @@ -1998,6 +1998,8 @@ from various forks of Gens, and improved platform portability.") (build-system gnu-build-system) (arguments `(#:make-flags (list "-C" "bsnes" + ;; Remove march=native + "local=false" (string-append "prefix=" (assoc-ref %outputs "out"))) #:tests? #f ; No tests. #:phases (modify-phases %standard-phases |