mod: update to nixpkgs 26.05, update vintage story to 1.22.3
Some checks failed
Publish packages to Attic / publish (push) Failing after 6m15s
Some checks failed
Publish packages to Attic / publish (push) Failing after 6m15s
This commit is contained in:
8
flake.lock
generated
8
flake.lock
generated
@@ -74,16 +74,16 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779467186,
|
"lastModified": 1780902259,
|
||||||
"narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=",
|
"narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b77b3de8775677f84492abe84635f87b0e153f0f",
|
"rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-25.11",
|
"ref": "nixos-26.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
description = "Miller Nix User Repository";
|
description = "Miller Nix User Repository";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
|
||||||
flake-utils.url = "github:numtide/flake-utils";
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
home-manager.url = "github:nix-community/home-manager";
|
home-manager.url = "github:nix-community/home-manager";
|
||||||
darwin.url = "github:LnL7/nix-darwin";
|
darwin.url = "github:LnL7/nix-darwin";
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ in pkgs.stdenv.mkDerivation (finalAttrs:
|
|||||||
inherit (pkgs) lib;
|
inherit (pkgs) lib;
|
||||||
in {
|
in {
|
||||||
pname = "vintagestory";
|
pname = "vintagestory";
|
||||||
version = "1.21.6";
|
version = "1.22.3";
|
||||||
|
|
||||||
src = pkgs.fetchurl {
|
src = pkgs.fetchurl {
|
||||||
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${finalAttrs.version}.tar.gz";
|
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${finalAttrs.version}.tar.gz";
|
||||||
@@ -78,7 +78,7 @@ in pkgs.stdenv.mkDerivation (finalAttrs:
|
|||||||
runtimeLibs' = lib.strings.makeLibraryPath finalAttrs.runtimeLibs;
|
runtimeLibs' = lib.strings.makeLibraryPath finalAttrs.runtimeLibs;
|
||||||
in
|
in
|
||||||
''
|
''
|
||||||
makeWrapper ${lib.meta.getExe pkgs.dotnet-runtime_8} $out/bin/vintagestory \
|
makeWrapper ${lib.meta.getExe pkgs.dotnet-runtime_10} $out/bin/vintagestory \
|
||||||
--prefix LD_LIBRARY_PATH : "${runtimeLibs'}" \
|
--prefix LD_LIBRARY_PATH : "${runtimeLibs'}" \
|
||||||
--set-default mesa_glthread true \
|
--set-default mesa_glthread true \
|
||||||
${lib.strings.optionalString waylandSupport ''
|
${lib.strings.optionalString waylandSupport ''
|
||||||
@@ -86,7 +86,7 @@ in pkgs.stdenv.mkDerivation (finalAttrs:
|
|||||||
''} \
|
''} \
|
||||||
--add-flags $out/share/vintagestory/Vintagestory.dll
|
--add-flags $out/share/vintagestory/Vintagestory.dll
|
||||||
|
|
||||||
makeWrapper ${lib.meta.getExe pkgs.dotnet-runtime_8} $out/bin/vintagestory-server \
|
makeWrapper ${lib.meta.getExe pkgs.dotnet-runtime_10} $out/bin/vintagestory-server \
|
||||||
--prefix LD_LIBRARY_PATH : "${runtimeLibs'}" \
|
--prefix LD_LIBRARY_PATH : "${runtimeLibs'}" \
|
||||||
--set-default mesa_glthread true \
|
--set-default mesa_glthread true \
|
||||||
--add-flags $out/share/vintagestory/VintagestoryServer.dll
|
--add-flags $out/share/vintagestory/VintagestoryServer.dll
|
||||||
|
|||||||
Reference in New Issue
Block a user