Merge pull request #249012 from GiggleSquid/pkgs/vintagestory

vintagestory: 1.18.7 -> 1.18.8

authored by Nick Cao and committed by GitHub cd822b49 ecaef165

+9 -31
+9 -31
pkgs/games/vintagestory/default.nix
··· 4 4 , makeWrapper 5 5 , makeDesktopItem 6 6 , copyDesktopItems 7 - , mono 8 7 , xorg 9 8 , gtk2 10 9 , sqlite ··· 16 15 , libglvnd 17 16 , pipewire 18 17 , libpulseaudio 19 - , experimental ? false 20 18 , dotnet-runtime_7 21 19 }: 22 20 23 21 stdenv.mkDerivation rec { 24 22 pname = "vintagestory"; 25 - version = if experimental then "1.18.8-rc.1" else "1.18.7"; 23 + version = "1.18.8"; 26 24 27 - src = 28 - if experimental 29 - then 30 - (fetchurl { 31 - url = "https://cdn.vintagestory.at/gamefiles/unstable/vs_client_linux-x64_${version}.tar.gz"; 32 - hash = "sha256-FxyAJTiLENTp5QxPKRgsiOhkMXz88CTn3QRvIHtOH+A="; 33 - }) 34 - else 35 - (fetchurl { 36 - url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz"; 37 - hash = "sha256-geJoNxBxODXQeTExLdTOaH84asjo2yg2xFm8Pj0IMc0="; 38 - }); 25 + src = fetchurl { 26 + url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz"; 27 + hash = "sha256-q7MxmsWCGODOt/hCkCPz964m7az27SddIRBJ1vYg02k="; 28 + }; 39 29 40 30 41 31 nativeBuildInputs = [ makeWrapper copyDesktopItems ]; 42 32 43 - buildInputs = 44 - if experimental then [ 45 - dotnet-runtime_7 46 - ] else [ 47 - mono 48 - ]; 33 + buildInputs = [ dotnet-runtime_7 ]; 49 34 50 35 runtimeLibs = lib.makeLibraryPath ([ 51 36 gtk2 ··· 65 50 66 51 desktopItems = makeDesktopItem { 67 52 name = "vintagestory"; 68 - desktopName = if experimental then "Vintage Story Experimental .net 7" else "Vintage Story"; 53 + desktopName = "Vintage Story"; 69 54 exec = "vintagestory"; 70 55 icon = "vintagestory"; 71 56 comment = "Innovate and explore in a sandbox world"; ··· 83 68 runHook postInstall 84 69 ''; 85 70 86 - preFixup = (if experimental then '' 71 + preFixup = '' 87 72 makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory \ 88 73 --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ 89 74 --add-flags $out/share/vintagestory/Vintagestory.dll 90 75 makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory-server \ 91 76 --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ 92 77 --add-flags $out/share/vintagestory/VintagestoryServer.dll 93 - '' else '' 94 - makeWrapper ${mono}/bin/mono $out/bin/vintagestory \ 95 - --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ 96 - --add-flags $out/share/vintagestory/Vintagestory.exe 97 - makeWrapper ${mono}/bin/mono $out/bin/vintagestory-server \ 98 - --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ 99 - --add-flags $out/share/vintagestory/VintagestoryServer.exe 100 - '') + '' 78 + '' + '' 101 79 find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do 102 80 local filename="$(basename -- "$file")" 103 81 ln -sf "$filename" "''${file%/*}"/"''${filename,,}"