tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
0ad: Alpha 17 -> Alpha 18
Anders Papitto
10 years ago
3455919c
4bcde3f2
+10
-6
2 changed files
expand all
collapse all
unified
split
pkgs
games
0ad
data.nix
default.nix
+1
-1
pkgs/games/0ad/data.nix
···
5
5
6
6
src = fetchurl {
7
7
url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-data.tar.xz";
8
8
-
sha256 = "6bf2234ef5043b14a3bbeda013fefed73ce2e564262f5e03b0801bfe671331d0";
8
8
+
sha256 = "0i5cf4n9qhzbi6hvw5lxapind24qpqfq6p5lrhx8gb25p670g95i";
9
9
};
10
10
11
11
patchPhase = ''
+9
-5
pkgs/games/0ad/default.nix
···
1
1
{ stdenv, callPackage, fetchurl, python27
2
2
-
, pkgconfig, spidermonkey_24, boost, icu, libxml2, libpng
2
2
+
, pkgconfig, spidermonkey_31, boost, icu, libxml2, libpng
3
3
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
4
4
, openal, mesa, xproto, libX11, libXcursor, nspr, SDL
5
5
, gloox, nvidia-texture-tools
···
9
9
assert withEditor -> wxGTK != null;
10
10
11
11
let
12
12
-
version = "0.0.17";
12
12
+
version = "0.0.18";
13
13
14
14
releaseType = "alpha";
15
15
···
25
25
26
26
src = fetchurl {
27
27
url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-build.tar.xz";
28
28
-
sha256 = "ef144d44fe8a8abd29a4642999a58a596b8f0d0e1f310065f5ce1dfbe29c3aeb";
28
28
+
sha256 = "15q3mv5k3lqzf0wrby2r93fs194ym13790i68q8azscs4v9h8bxx";
29
29
};
30
30
31
31
buildInputs = [
32
32
-
zeroadData python27 pkgconfig spidermonkey_24 boost icu
32
32
+
zeroadData python27 pkgconfig spidermonkey_31 boost icu
33
33
libxml2 libpng libjpeg zlib curl libogg libvorbis enet
34
34
miniupnpc openal mesa xproto libX11 libXcursor nspr
35
35
SDL gloox nvidia-texture-tools
···
40
40
"-I${libX11}/include/X11"
41
41
"-I${libXcursor}/include/X11"
42
42
];
43
43
+
44
44
+
patchPhase = ''
45
45
+
sed -i 's/MOZJS_MINOR_VERSION/false \&\& MOZJS_MINOR_VERSION/' source/scriptinterface/ScriptTypes.h
46
46
+
'';
43
47
44
48
configurePhase = ''
45
49
# Delete shipped libraries which we don't need.
···
58
62
--with-system-nvtt \
59
63
--with-system-enet \
60
64
--with-system-miniupnpc \
61
61
-
--with-system-mozjs24 \
65
65
+
--with-system-mozjs31 \
62
66
${ if withEditor then "--atlas" else "" } \
63
67
--collada \
64
68
--bindir="$out"/bin \