diff --git a/flake.lock b/flake.lock index ec7ff71..3e38940 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1772963539, + "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4826238..803fb4b 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,8 @@ }; }; + formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree); + packages = forAllSystems ( { pkgs }: { diff --git a/pkgs/path-of-building-poe2/default.nix b/pkgs/path-of-building-poe2/default.nix index 516c76a..cb25f30 100644 --- a/pkgs/path-of-building-poe2/default.nix +++ b/pkgs/path-of-building-poe2/default.nix @@ -64,7 +64,8 @@ stdenv.mkDerivation { qttools wrapQtAppsHook icoutils - ] ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems; + ] + ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems; buildInputs = [ qtbase diff --git a/pkgs/vintagestory/default.nix b/pkgs/vintagestory/default.nix index 53084b4..7df3f24 100644 --- a/pkgs/vintagestory/default.nix +++ b/pkgs/vintagestory/default.nix @@ -75,24 +75,23 @@ stdenv.mkDerivation rec { runHook postInstall ''; - preFixup = - '' - sed -i 's/net7.0/net8.0/' $out/share/vintagestory/Vintagestory.runtimeconfig.json - sed -i 's/7.0.0/8.0.11/' $out/share/vintagestory/Vintagestory.runtimeconfig.json + preFixup = '' + sed -i 's/net7.0/net8.0/' $out/share/vintagestory/Vintagestory.runtimeconfig.json + sed -i 's/7.0.0/8.0.11/' $out/share/vintagestory/Vintagestory.runtimeconfig.json - makeWrapper ${dotnet-runtime_8}/bin/dotnet $out/bin/vintagestory \ - --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --add-flags $out/share/vintagestory/Vintagestory.dll - makeWrapper ${dotnet-runtime_8}/bin/dotnet $out/bin/vintagestory-server \ - --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --add-flags $out/share/vintagestory/VintagestoryServer.dll - '' - + '' - find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do - local filename="$(basename -- "$file")" - ln -sf "$filename" "''${file%/*}"/"''${filename,,}" - done - ''; + makeWrapper ${dotnet-runtime_8}/bin/dotnet $out/bin/vintagestory \ + --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --add-flags $out/share/vintagestory/Vintagestory.dll + makeWrapper ${dotnet-runtime_8}/bin/dotnet $out/bin/vintagestory-server \ + --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --add-flags $out/share/vintagestory/VintagestoryServer.dll + '' + + '' + find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do + local filename="$(basename -- "$file")" + ln -sf "$filename" "''${file%/*}"/"''${filename,,}" + done + ''; meta = with lib; { description = "In-development indie sandbox game about innovation and exploration";