Update Nix package to 0.24.0 (space-wizards#108)

* Update flake lock * Update Nix package to 0.24.0
Visne · Oct 21, 2023 · 6e2820f · 6e2820f
1 parent fe327cb
commit 6e2820f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/nix/package.nix b/nix/package.nix
@@ -31,7 +31,7 @@
 , gdk-pixbuf
 }:
 let
-  version = "0.23.0";
+  version = "0.24.0";
   pname = "space-station-14-launcher";
 in
 buildDotnetModule rec {
@@ -45,7 +45,7 @@ buildDotnetModule rec {
     owner = "space-wizards";
     repo = "SS14.Launcher";
     rev = "v${version}";
-    hash = "sha256-ZQinZBWAsOUbZ8Ew2jV0O+aQP5PzYzbon+AWShtX/J0=";
+    hash = "sha256-n0OiNxw9QDibX5HBSzq6jdOxyUd0bPkjKd+mtb/S/BY=";
     fetchSubmodules = true;
   };
 

diff --git a/nix/wrapper.nix b/nix/wrapper.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  space-station-14-launcher = callPackage ./package.nix { };
+  launcher = callPackage ./package.nix { };
 
   # Workaround for hardcoded soundfont paths in downloaded engine assemblies.
   soundfont-fluid-fixed = runCommand "soundfont-fluid-fixed" { } ''
@@ -14,27 +14,27 @@ let
   '';
 in
 buildFHSEnv rec {
-  name = "space-station-14-launcher-wrapped";
+  name = "${launcher.pname}-wrapped-${launcher.version}";
 
   targetPkgs = pkgs: [
-    space-station-14-launcher
+    launcher
     soundfont-fluid-fixed
   ];
 
   runScript = "SS14.Launcher";
 
   extraInstallCommands = ''
     mkdir -p $out/share/applications
-    ln -s ${space-station-14-launcher}/share/icons $out/share
-    cp ${space-station-14-launcher}/share/applications/space-station-14-launcher.desktop "$out/share/applications"
+    ln -s ${launcher}/share/icons $out/share
+    cp ${launcher}/share/applications/space-station-14-launcher.desktop "$out/share/applications"
     substituteInPlace "$out/share/applications/space-station-14-launcher.desktop" \
-        --replace ${space-station-14-launcher.meta.mainProgram} ${meta.mainProgram}
+        --replace ${launcher.meta.mainProgram} ${meta.mainProgram}
   '';
 
-  passthru = space-station-14-launcher.passthru // {
-    unwrapped = space-station-14-launcher;
+  passthru = launcher.passthru // {
+    unwrapped = launcher;
   };
-  meta = space-station-14-launcher.meta // {
+  meta = launcher.meta // {
     mainProgram = name;
   };
 }