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

openxray: replace fix with proper patch

Browse Source 
for glibc 2.32 compatibility
This commit is contained in:
gnidorah 2020-11-29 12:47:58 +03:00
parent 6f0c00907b
commit f7029d628b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, glew, freeimage, liblockfile { stdenv, fetchFromGitHub, cmake, glew, freeimage, liblockfile
, openal, libtheora, SDL2, lzo, libjpeg, libogg, tbb , openal, libtheora, SDL2, lzo, libjpeg, libogg, tbb
, pcre, makeWrapper }: , pcre, makeWrapper, fetchpatch }:
let let
version = "784-october-preview"; version = "784-october-preview";
@ -41,6 +41,13 @@ in stdenv.mkDerivation rec {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ]; cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ];
patches = [
(fetchpatch {
url = "https://github.com/OpenXRay/xray-16/commit/4532cba11e98808c92e56e246188863261ef9201.patch";
sha256 = "1hrm4rkkg946ai95krzpf3isryzbb2vips63gxf481plv4vlcfc9";
})
];
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
@ -50,10 +57,6 @@ in stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
substituteInPlace src/xrCore/xrCore.cpp \ substituteInPlace src/xrCore/xrCore.cpp \
--replace /usr/share $out/share --replace /usr/share $out/share
# https://github.com/OpenXRay/xray-16/issues/667
echo "inline const char* xr_sys_errlist[100] = {};" >> src/Common/PlatformLinux.inl
echo "#define _sys_errlist xr_sys_errlist" >> src/Common/PlatformLinux.inl
''; '';
postInstall = '' postInstall = ''