From 6e2820ffb52c83293ccc3d61dc30b719b46785c8 Mon Sep 17 00:00:00 2001
From: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
Date: Sat, 21 Oct 2023 18:47:23 +0200
Subject: [PATCH] Update Nix package to 0.24.0 (#108)

* Update flake lock

* Update Nix package to 0.24.0
---
 flake.lock      |  6 +++---
 nix/package.nix |  4 ++--
 nix/wrapper.nix | 18 +++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3e47264c..bd655402 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1689605451,
-        "narHash": "sha256-u2qp2k9V1smCfk6rdUcgMKvBj3G9jVvaPHyeXinjN9E=",
+        "lastModified": 1697900913,
+        "narHash": "sha256-rHGtUEwFSn925Hwtp1M67iuji90lJ72tzUUlnKHc5Rk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "53657afe29748b3e462f1f892287b7e254c26d77",
+        "rev": "82255eab05db2414aa2f627089c3fdbc4d2fa9a3",
         "type": "github"
       },
       "original": {
diff --git a/nix/package.nix b/nix/package.nix
index 42f320e8..f4986c9a 100644
--- 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
index 8c17218f..52ec1cf7 100644
--- 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,10 +14,10 @@ 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
   ];
 
@@ -25,16 +25,16 @@ buildFHSEnv rec {
 
   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;
   };
 }