pyrox.dev / nixpkgs
lol
fork atom

openxray: Remove multiplayer option, fix license URL

Multiplayer code was never ported to Linux and crashes even with the vendored cryptopp.
Upstream suggested that we should just remove it.

OPNA2608 68354795 4cd95597

+3 -44
unified split
+3 -44
pkgs/games/openxray/default.nix
··· 13 , libogg 14 , pcre 15 , makeWrapper 16 - , enableMultiplayer ? false # Requires old, insecure Crypto++ version 17 }: 18 19 - let 20 version = "1144-december-2021-rc1"; 21 22 src = fetchFromGitHub { ··· 27 sha256 = "07qj1lpp21g4p583gvz5h66y2q71ymbsz4g5nr6dcys0vm7ph88v"; 28 }; 29 30 - # https://github.com/OpenXRay/xray-16/issues/518 31 - ancientCryptopp = stdenv.mkDerivation { 32 - pname = "cryptopp"; 33 - version = "5.6.5"; 34 - 35 - inherit src; 36 - 37 - sourceRoot = "source/Externals/cryptopp"; 38 - 39 - installFlags = [ "PREFIX=${placeholder "out"}" ]; 40 - 41 - enableParallelBuilding = true; 42 - 43 - doCheck = true; 44 - 45 - dontStrip = true; 46 - 47 - meta = with lib; { 48 - description = "Crypto++, a free C++ class library of cryptographic schemes"; 49 - homepage = "https://cryptopp.com/"; 50 - license = with licenses; [ boost publicDomain ]; 51 - platforms = platforms.all; 52 - knownVulnerabilities = [ 53 - "CVE-2019-14318" 54 - ]; 55 - }; 56 - }; 57 - in 58 - stdenv.mkDerivation rec { 59 - pname = "openxray"; 60 - 61 - inherit version src; 62 - 63 nativeBuildInputs = [ 64 cmake 65 makeWrapper ··· 76 libjpeg 77 libogg 78 pcre 79 - ] ++ lib.optionals enableMultiplayer [ 80 - ancientCryptopp 81 ]; 82 83 # Crashes can happen, we'd like them to be reasonably debuggable 84 cmakeBuildType = "RelWithDebInfo"; 85 dontStrip = true; 86 87 - cmakeFlags = [ 88 - "-DUSE_CRYPTOPP=${if enableMultiplayer then "ON" else "OFF"}" 89 - ] ++ lib.optionals enableMultiplayer [ 90 - "-DCMAKE_INCLUDE_PATH=${ancientCryptopp}/include/cryptopp" 91 - ]; 92 - 93 postInstall = '' 94 # needed because of SDL_LoadObject library loading code 95 wrapProgram $out/bin/xr_3da \ ··· 101 description = "Improved version of the X-Ray Engine, the game engine used in the world-famous S.T.A.L.K.E.R. game series by GSC Game World"; 102 homepage = "https://github.com/OpenXRay/xray-16/"; 103 license = licenses.unfree // { 104 - url = "https://github.com/OpenXRay/xray-16/blob/xd_dev/License.txt"; 105 }; 106 maintainers = with maintainers; [ OPNA2608 ]; 107 platforms = [ "x86_64-linux" "i686-linux" ];
··· 13 , libogg 14 , pcre 15 , makeWrapper 16 }: 17 18 + stdenv.mkDerivation rec { 19 + pname = "openxray"; 20 version = "1144-december-2021-rc1"; 21 22 src = fetchFromGitHub { ··· 27 sha256 = "07qj1lpp21g4p583gvz5h66y2q71ymbsz4g5nr6dcys0vm7ph88v"; 28 }; 29 30 nativeBuildInputs = [ 31 cmake 32 makeWrapper ··· 43 libjpeg 44 libogg 45 pcre 46 ]; 47 48 # Crashes can happen, we'd like them to be reasonably debuggable 49 cmakeBuildType = "RelWithDebInfo"; 50 dontStrip = true; 51 52 postInstall = '' 53 # needed because of SDL_LoadObject library loading code 54 wrapProgram $out/bin/xr_3da \ ··· 60 description = "Improved version of the X-Ray Engine, the game engine used in the world-famous S.T.A.L.K.E.R. game series by GSC Game World"; 61 homepage = "https://github.com/OpenXRay/xray-16/"; 62 license = licenses.unfree // { 63 + url = "https://github.com/OpenXRay/xray-16/blob/${version}/License.txt"; 64 }; 65 maintainers = with maintainers; [ OPNA2608 ]; 66 platforms = [ "x86_64-linux" "i686-linux" ];