diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-11 08:59:44 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-11 08:59:44 +0100 |
commit | 7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8 (patch) | |
tree | 7061d7dc8c0e31d96e35fef2adce9999713be9f2 /pkgs/misc/emulators | |
parent | ed8400bb9a59f267185d2d09b8f47d270a44ee99 (diff) | |
parent | 3c4f70996e46ed7e9c3a480f51398194d31e3e93 (diff) | |
download | nixlib-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.tar nixlib-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.tar.gz nixlib-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.tar.bz2 nixlib-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.tar.lz nixlib-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.tar.xz nixlib-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.tar.zst nixlib-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r-- | pkgs/misc/emulators/dosbox/default.nix | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index 57e76a964376..878e98fa1665 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -1,31 +1,16 @@ -{ stdenv, lib, fetchurl, SDL, makeDesktopItem, libGLU_combined }: +{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU_combined, libpng }: stdenv.mkDerivation rec { - name = "dosbox-0.74"; + name = "dosbox-0.74-2"; src = fetchurl { url = "mirror://sourceforge/dosbox/${name}.tar.gz"; - sha256 = "01cfjc5bs08m4w79nbxyv7rnvzq2yckmgrbq36njn06lw8b4kxqk"; + sha256 = "1ksp1b5szi0vy4x55rm3j1y9wq5mlslpy8llpg87rpdyjlsk0xvh"; }; - patches = - [ # Fix building with GCC 4.6. - (fetchurl { - url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch?revision=1.1"; - sha256 = "03iv1ph7fccfw327ngnhvzwyiix7fsbdb5mmpxivzkidhlrssxq9"; - }) - (fetchurl { - url = "https://svnweb.freebsd.org/ports/head/emulators/dosbox/files/patch-src_gui_sdlmain.cpp?revision=435580&view=co&pathrev=435580"; - sha256 = "1mbj5wrn53k0zds2adys34949vzsbfgm0pmsyx14v9j0cxi7drca"; - name = "patch-src_gui_sdlmain.cpp"; - }) - ]; - - patchFlags = "-p0"; - hardeningDisable = [ "format" ]; - buildInputs = [ SDL libGLU_combined ]; + buildInputs = [ SDL SDL_net SDL_sound libGLU_combined libpng ]; configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; @@ -43,6 +28,8 @@ stdenv.mkDerivation rec { cp ${desktopItem}/share/applications/* $out/share/applications ''; + enableParallelBuilding = true; + meta = with lib; { homepage = http://www.dosbox.com/; description = "A DOS emulator"; |