tangled
alpha
login
or
join now
tjh.dev
/
nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
0
fork
atom
overview
issues
pulls
pipelines
dosbox: 0.74 -> 0.74-2
Orivej Desh
7 years ago
65e0b5c7
b3e2a484
+6
-19
1 changed file
expand all
collapse all
unified
split
pkgs
misc
emulators
dosbox
default.nix
+6
-19
pkgs/misc/emulators/dosbox/default.nix
···
1
1
-
{ stdenv, lib, fetchurl, SDL, makeDesktopItem, libGLU_combined }:
1
1
+
{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU_combined, libpng }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
-
name = "dosbox-0.74";
4
4
+
name = "dosbox-0.74-2";
5
5
6
6
src = fetchurl {
7
7
url = "mirror://sourceforge/dosbox/${name}.tar.gz";
8
8
-
sha256 = "01cfjc5bs08m4w79nbxyv7rnvzq2yckmgrbq36njn06lw8b4kxqk";
8
8
+
sha256 = "1ksp1b5szi0vy4x55rm3j1y9wq5mlslpy8llpg87rpdyjlsk0xvh";
9
9
};
10
10
11
11
-
patches =
12
12
-
[ # Fix building with GCC 4.6.
13
13
-
(fetchurl {
14
14
-
url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch?revision=1.1";
15
15
-
sha256 = "03iv1ph7fccfw327ngnhvzwyiix7fsbdb5mmpxivzkidhlrssxq9";
16
16
-
})
17
17
-
(fetchurl {
18
18
-
url = "https://svnweb.freebsd.org/ports/head/emulators/dosbox/files/patch-src_gui_sdlmain.cpp?revision=435580&view=co&pathrev=435580";
19
19
-
sha256 = "1mbj5wrn53k0zds2adys34949vzsbfgm0pmsyx14v9j0cxi7drca";
20
20
-
name = "patch-src_gui_sdlmain.cpp";
21
21
-
})
22
22
-
];
23
23
-
24
24
-
patchFlags = "-p0";
25
25
-
26
11
hardeningDisable = [ "format" ];
27
12
28
28
-
buildInputs = [ SDL libGLU_combined ];
13
13
+
buildInputs = [ SDL SDL_net SDL_sound libGLU_combined libpng ];
29
14
30
15
configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
31
16
···
42
27
mkdir -p $out/share/applications
43
28
cp ${desktopItem}/share/applications/* $out/share/applications
44
29
'';
30
30
+
31
31
+
enableParallelBuilding = true;
45
32
46
33
meta = with lib; {
47
34
homepage = http://www.dosbox.com/;