diff options
author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2020-11-29 11:04:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-29 11:04:58 +0100 |
commit | dd59931b578265206f4f00c39cd772029934d449 (patch) | |
tree | 75a539407250d65e79ecbd13d0126a16e9208802 /pkgs | |
parent | 82cf3b9317af9ef14961f082d624fb94b0226d74 (diff) | |
parent | f7029d628b0cdc521cdb1ae0f1fe1bc35e8abb77 (diff) |
Merge pull request #104294 from gnidorah/openxray
openxray: replace fix with proper patch
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/games/openxray/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index 13bc046e8643..304a810c3db2 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, glew, freeimage, liblockfile , openal, libtheora, SDL2, lzo, libjpeg, libogg, tbb -, pcre, makeWrapper }: +, pcre, makeWrapper, fetchpatch }: let version = "784-october-preview"; @@ -41,6 +41,13 @@ in stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ]; + patches = [ + (fetchpatch { + url = "https://github.com/OpenXRay/xray-16/commit/4532cba11e98808c92e56e246188863261ef9201.patch"; + sha256 = "1hrm4rkkg946ai95krzpf3isryzbb2vips63gxf481plv4vlcfc9"; + }) + ]; + buildInputs = [ glew freeimage liblockfile openal cryptopp libtheora SDL2 lzo libjpeg libogg tbb pcre @@ -50,10 +57,6 @@ in stdenv.mkDerivation rec { preConfigure = '' substituteInPlace src/xrCore/xrCore.cpp \ --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 = '' |