chore(nix): use self for version

Signed-off-by: seth <[email protected]>
Diegiwg · Oct 25, 2024 · 63b1073 · 63b1073
1 parent a5c554c
commit 63b1073
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/flake.nix b/flake.nix
@@ -85,24 +85,18 @@
 
       formatter = forAllSystems (system: nixpkgsFor.${system}.nixfmt-rfc-style);
 
-      overlays.default =
-        final: prev:
-        let
-          version = builtins.substring 0 8 self.lastModifiedDate or "dirty";
-        in
-        {
-          prismlauncher-unwrapped = prev.callPackage ./nix/unwrapped.nix {
-            inherit
-              libnbtplusplus
-              nix-filter
-              self
-              version
-              ;
-          };
-
-          prismlauncher = final.callPackage ./nix/wrapper.nix { };
+      overlays.default = final: prev: {
+        prismlauncher-unwrapped = prev.callPackage ./nix/unwrapped.nix {
+          inherit
+            libnbtplusplus
+            nix-filter
+            self
+            ;
         };
 
+        prismlauncher = final.callPackage ./nix/wrapper.nix { };
+      };
+
       packages = forAllSystems (
         system:
         let

diff --git a/nix/unwrapped.nix b/nix/unwrapped.nix
@@ -15,7 +15,6 @@
   self,
   stripJavaArchivesHook,
   tomlplusplus,
-  version,
   zlib,
 
   msaClientID ? null,
@@ -28,7 +27,7 @@ assert lib.assertMsg (
 
 stdenv.mkDerivation {
   pname = "prismlauncher-unwrapped";
-  inherit version;
+  version = self.shortRev or self.dirtyShortRev or "unknown";
 
   src = nix-filter.lib {
     root = self;