Merge pull request #249012 from GiggleSquid/pkgs/vintagestory
vintagestory: 1.18.7 -> 1.18.8
This commit is contained in:
commit
cd822b4978
1 changed files with 9 additions and 31 deletions
|
@ -4,7 +4,6 @@
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, makeDesktopItem
|
, makeDesktopItem
|
||||||
, copyDesktopItems
|
, copyDesktopItems
|
||||||
, mono
|
|
||||||
, xorg
|
, xorg
|
||||||
, gtk2
|
, gtk2
|
||||||
, sqlite
|
, sqlite
|
||||||
|
@ -16,36 +15,22 @@
|
||||||
, libglvnd
|
, libglvnd
|
||||||
, pipewire
|
, pipewire
|
||||||
, libpulseaudio
|
, libpulseaudio
|
||||||
, experimental ? false
|
|
||||||
, dotnet-runtime_7
|
, dotnet-runtime_7
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "vintagestory";
|
pname = "vintagestory";
|
||||||
version = if experimental then "1.18.8-rc.1" else "1.18.7";
|
version = "1.18.8";
|
||||||
|
|
||||||
src =
|
src = fetchurl {
|
||||||
if experimental
|
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
|
||||||
then
|
hash = "sha256-q7MxmsWCGODOt/hCkCPz964m7az27SddIRBJ1vYg02k=";
|
||||||
(fetchurl {
|
};
|
||||||
url = "https://cdn.vintagestory.at/gamefiles/unstable/vs_client_linux-x64_${version}.tar.gz";
|
|
||||||
hash = "sha256-FxyAJTiLENTp5QxPKRgsiOhkMXz88CTn3QRvIHtOH+A=";
|
|
||||||
})
|
|
||||||
else
|
|
||||||
(fetchurl {
|
|
||||||
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz";
|
|
||||||
hash = "sha256-geJoNxBxODXQeTExLdTOaH84asjo2yg2xFm8Pj0IMc0=";
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
|
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs = [ dotnet-runtime_7 ];
|
||||||
if experimental then [
|
|
||||||
dotnet-runtime_7
|
|
||||||
] else [
|
|
||||||
mono
|
|
||||||
];
|
|
||||||
|
|
||||||
runtimeLibs = lib.makeLibraryPath ([
|
runtimeLibs = lib.makeLibraryPath ([
|
||||||
gtk2
|
gtk2
|
||||||
|
@ -65,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
desktopItems = makeDesktopItem {
|
desktopItems = makeDesktopItem {
|
||||||
name = "vintagestory";
|
name = "vintagestory";
|
||||||
desktopName = if experimental then "Vintage Story Experimental .net 7" else "Vintage Story";
|
desktopName = "Vintage Story";
|
||||||
exec = "vintagestory";
|
exec = "vintagestory";
|
||||||
icon = "vintagestory";
|
icon = "vintagestory";
|
||||||
comment = "Innovate and explore in a sandbox world";
|
comment = "Innovate and explore in a sandbox world";
|
||||||
|
@ -83,21 +68,14 @@ stdenv.mkDerivation rec {
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preFixup = (if experimental then ''
|
preFixup = ''
|
||||||
makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory \
|
makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory \
|
||||||
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
|
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
|
||||||
--add-flags $out/share/vintagestory/Vintagestory.dll
|
--add-flags $out/share/vintagestory/Vintagestory.dll
|
||||||
makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory-server \
|
makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory-server \
|
||||||
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
|
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
|
||||||
--add-flags $out/share/vintagestory/VintagestoryServer.dll
|
--add-flags $out/share/vintagestory/VintagestoryServer.dll
|
||||||
'' else ''
|
'' + ''
|
||||||
makeWrapper ${mono}/bin/mono $out/bin/vintagestory \
|
|
||||||
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
|
|
||||||
--add-flags $out/share/vintagestory/Vintagestory.exe
|
|
||||||
makeWrapper ${mono}/bin/mono $out/bin/vintagestory-server \
|
|
||||||
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
|
|
||||||
--add-flags $out/share/vintagestory/VintagestoryServer.exe
|
|
||||||
'') + ''
|
|
||||||
find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do
|
find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do
|
||||||
local filename="$(basename -- "$file")"
|
local filename="$(basename -- "$file")"
|
||||||
ln -sf "$filename" "''${file%/*}"/"''${filename,,}"
|
ln -sf "$filename" "''${file%/*}"/"''${filename,,}"
|
||||||
|
|
Loading…
Reference in a new issue