Merge pull request #104294 from gnidorah/openxray
openxray: replace fix with proper patch
This commit is contained in:
commit
dd59931b57
|
@ -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 = ''
|
||||
|
|
Loading…
Reference in a new issue