diff options
| author | gnidorah <gnidorah@users.noreply.github.com> | 2020-07-12 00:09:47 +0300 |
|---|---|---|
| committer | gnidorah <gnidorah@users.noreply.github.com> | 2020-08-06 08:58:45 +0300 |
| commit | b41f79fe8418dab0d5aff6a6a08b8649f8a46acd (patch) | |
| tree | 4966962ea8bb97fc8ac4fdb41c79e70f182304e7 | |
| parent | e31a4679d502cb4ea07236eca8faba1ce1dc67b9 (diff) | |
| download | nixpkgs-b41f79fe8418dab0d5aff6a6a08b8649f8a46acd.tar nixpkgs-b41f79fe8418dab0d5aff6a6a08b8649f8a46acd.tar.gz nixpkgs-b41f79fe8418dab0d5aff6a6a08b8649f8a46acd.tar.bz2 nixpkgs-b41f79fe8418dab0d5aff6a6a08b8649f8a46acd.tar.lz nixpkgs-b41f79fe8418dab0d5aff6a6a08b8649f8a46acd.tar.xz nixpkgs-b41f79fe8418dab0d5aff6a6a08b8649f8a46acd.tar.zst nixpkgs-b41f79fe8418dab0d5aff6a6a08b8649f8a46acd.zip | |
openxray: 558 -> 730
| -rw-r--r-- | pkgs/games/openxray/default.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index 9e38852a02a..fe2e978c4cc 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -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 |