public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openxray: 784-october-preview -> 822-december-preview

This commit is contained in:
OPNA2608 2021-05-07 09:19:32 +02:00 committed by Jonathan Ringer
parent 15254515d0
commit fc2e0709f0
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/games/openxray/default.nix
View File

@ -3,14 +3,14 @@
, pcre, makeWrapper, fetchpatch }: , pcre, makeWrapper, fetchpatch }:
let let
version = "784-october-preview"; version = "822-december-preview";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OpenXRay"; owner = "OpenXRay";
repo = "xray-16"; repo = "xray-16";
rev = version; rev = version;
sha256 = "0q0h70gbpscdvn45wpxicljj4ji3cd2maijd5b7jhr1695h61q5y";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "06f3zjnib7hipyl3hnc6mwcj9f50kbwn522wzdjydz8qgdg60h3m";
}; };
# https://github.com/OpenXRay/xray-16/issues/518 # https://github.com/OpenXRay/xray-16/issues/518
@ -20,7 +20,7 @@ let
inherit src; inherit src;
postUnpack = "sourceRoot+=/Externals/cryptopp"; sourceRoot = "source/Externals/cryptopp";
makeFlags = [ "PREFIX=${placeholder "out"}" ]; makeFlags = [ "PREFIX=${placeholder "out"}" ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -35,25 +35,30 @@ let
}; };
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "OpenXRay"; pname = "openxray";
inherit version src; inherit version src;
hardeningDisable = [ "format" ]; # TODO https://github.com/OpenXRay/GameSpy/pull/6, check if merged in version > 822
cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ]; # Fixes format hardening
patches = [ patches = [
(fetchpatch { (fetchpatch {
url = "https://github.com/OpenXRay/xray-16/commit/4532cba11e98808c92e56e246188863261ef9201.patch"; url = "https://github.com/OpenXRay/GameSpy/pull/6/commits/155af876281f5d94f0142886693314d97deb2d4c.patch";
sha256 = "1hrm4rkkg946ai95krzpf3isryzbb2vips63gxf481plv4vlcfc9"; sha256 = "1l0vcgvzzx8n56shpblpfdhvpr6c12fcqf35r0mflaiql8q7wn88";
stripLen = 1;
extraPrefix = "Externals/GameSpy/";
}) })
]; ];
cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ];
buildInputs = [ buildInputs = [
glew freeimage liblockfile openal cryptopp libtheora SDL2 lzo glew freeimage liblockfile openal cryptopp libtheora SDL2 lzo
libjpeg libogg tbb pcre libjpeg libogg tbb pcre
]; ];
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];
# https://github.com/OpenXRay/xray-16/issues/786
preConfigure = '' preConfigure = ''
substituteInPlace src/xrCore/xrCore.cpp \ substituteInPlace src/xrCore/xrCore.cpp \
--replace /usr/share $out/share --replace /usr/share $out/share
@ -71,7 +76,7 @@ in stdenv.mkDerivation rec {
license = licenses.unfree // { license = licenses.unfree // {
url = "https://github.com/OpenXRay/xray-16/blob/xd_dev/License.txt"; url = "https://github.com/OpenXRay/xray-16/blob/xd_dev/License.txt";
}; };
maintainers = [ ]; maintainers = with maintainers; [ OPNA2608 ];
platforms = [ "x86_64-linux" "i686-linux" ]; platforms = [ "x86_64-linux" "i686-linux" ];
}; };
} }