From fe8acc5e8007e37f1ead68d41c5371f3c76cd7c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= Date: Mon, 29 Sep 2025 15:14:43 +0200 Subject: [PATCH] flake: add formatter --- flake.nix | 1 + home/packages/vintagestory.nix | 33 ++++++++++++++++----------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index e719cb8..8c97995 100644 --- a/flake.nix +++ b/flake.nix @@ -84,6 +84,7 @@ ]; in { + formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-tree; nixosConfigurations = { prismo = nixpkgs.lib.nixosSystem { inherit system; diff --git a/home/packages/vintagestory.nix b/home/packages/vintagestory.nix index c9c789c..85f59f0 100644 --- a/home/packages/vintagestory.nix +++ b/home/packages/vintagestory.nix @@ -77,24 +77,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";