openxray: 558 -> 730

This commit is contained in:
gnidorah 2020-07-12 00:09:47 +03:00
parent e31a4679d5
commit b41f79fe84

View File

@ -3,13 +3,13 @@
, pcre, makeWrapper }:
let
version = "558";
version = "730-july-preview";
src = fetchFromGitHub {
owner = "OpenXRay";
repo = "xray-16";
rev = version;
sha256 = "1wnkx9g0ww4f5pljrb0wzs054jzkig1i5hlz1p509rfvnhc50afp";
sha256 = "1nish3sbpk0hsag7r4nyx8j6pl9mlgx58v8dhzg2vwj2q32isyb2";
fetchSubmodules = true;
};
@ -40,7 +40,6 @@ in stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ];
installFlags = [ "DESTDIR=${placeholder "out"}" ];
buildInputs = [
glew freeimage liblockfile openal cryptopp libtheora SDL2 lzo
@ -54,11 +53,6 @@ in stdenv.mkDerivation rec {
'';
postInstall = ''
mv $out/var/empty/* $out
install -Dm755 $out/games/xr_3da $out/bin/xr_3da
install -Dm644 $src/License.txt $out/share/licenses/openxray/License.txt
rm -r $out/var $out/games
# needed because of SDL_LoadObject library loading code
wrapProgram $out/bin/xr_3da \
--prefix LD_LIBRARY_PATH : $out/lib