pyrox.dev
openxray: 784-october-preview -> 822-december-preview
authored by OPNA2608 and committed by Jonathan Ringer fc2e0709 15254515
+15
-10
pkgs/games/openxray/default.nix
+15
-10
pkgs/games/openxray/default.nix
···
3
3
, pcre, makeWrapper, fetchpatch }:
4
4
5
5
let
6
-
version = "784-october-preview";
6
+
version = "822-december-preview";
7
7
8
8
src = fetchFromGitHub {
9
9
owner = "OpenXRay";
10
10
repo = "xray-16";
11
11
rev = version;
12
-
sha256 = "0q0h70gbpscdvn45wpxicljj4ji3cd2maijd5b7jhr1695h61q5y";
13
12
fetchSubmodules = true;
13
+
sha256 = "06f3zjnib7hipyl3hnc6mwcj9f50kbwn522wzdjydz8qgdg60h3m";
14
14
};
15
15
16
16
# https://github.com/OpenXRay/xray-16/issues/518
···
20
20
21
21
inherit src;
22
22
23
-
postUnpack = "sourceRoot+=/Externals/cryptopp";
23
+
sourceRoot = "source/Externals/cryptopp";
24
24
25
25
makeFlags = [ "PREFIX=${placeholder "out"}" ];
26
26
enableParallelBuilding = true;
···
35
35
};
36
36
};
37
37
in stdenv.mkDerivation rec {
38
-
pname = "OpenXRay";
38
+
pname = "openxray";
39
39
inherit version src;
40
40
41
-
hardeningDisable = [ "format" ];
42
-
cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ];
43
-
41
+
# TODO https://github.com/OpenXRay/GameSpy/pull/6, check if merged in version > 822
42
+
# Fixes format hardening
44
43
patches = [
45
44
(fetchpatch {
46
-
url = "https://github.com/OpenXRay/xray-16/commit/4532cba11e98808c92e56e246188863261ef9201.patch";
47
-
sha256 = "1hrm4rkkg946ai95krzpf3isryzbb2vips63gxf481plv4vlcfc9";
45
+
url = "https://github.com/OpenXRay/GameSpy/pull/6/commits/155af876281f5d94f0142886693314d97deb2d4c.patch";
46
+
sha256 = "1l0vcgvzzx8n56shpblpfdhvpr6c12fcqf35r0mflaiql8q7wn88";
47
+
stripLen = 1;
48
+
extraPrefix = "Externals/GameSpy/";
48
49
})
49
50
];
50
51
52
+
cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ];
53
+
51
54
buildInputs = [
52
55
glew freeimage liblockfile openal cryptopp libtheora SDL2 lzo
53
56
libjpeg libogg tbb pcre
54
57
];
58
+
55
59
nativeBuildInputs = [ cmake makeWrapper ];
56
60
61
+
# https://github.com/OpenXRay/xray-16/issues/786
57
62
preConfigure = ''
58
63
substituteInPlace src/xrCore/xrCore.cpp \
59
64
--replace /usr/share $out/share
···
71
76
license = licenses.unfree // {
72
77
url = "https://github.com/OpenXRay/xray-16/blob/xd_dev/License.txt";
73
78
};
74
-
maintainers = [ ];
79
+
maintainers = with maintainers; [ OPNA2608 ];
75
80
platforms = [ "x86_64-linux" "i686-linux" ];
76
81
};
77
82
}