From 6bb528383d89759cd2c513565e317241594ed427 Mon Sep 17 00:00:00 2001
From: SpiralP <spiral.palmer@gmail.com>
Date: Tue, 31 Dec 2024 14:16:34 -0800
Subject: [PATCH] nix: only use rev hash if it exists

---
 flake.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index e3ef269..97fc2a5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,9 @@
       nodeManifest = lib.importJSON ./package.json;
       rustManifest = lib.importTOML ./Cargo.toml;
 
+      revSuffix = lib.optionalString (self ? shortRev || self ? dirtyShortRev)
+        "-${self.shortRev or self.dirtyShortRev}";
+
       makePackage = (system: dev:
         let
           pkgs = import nixpkgs {
@@ -48,7 +51,7 @@
         rec {
           default = pkgs.buildNpmPackage rec {
             pname = nodeManifest.name;
-            version = "${nodeManifest.version}-${self.shortRev or self.dirtyShortRev}";
+            version = nodeManifest.version + revSuffix;
 
             src = lib.sourceByRegex ./. [
               "^\.gitignore$"
@@ -132,7 +135,7 @@
 
           wasm = pkgs.rustPlatform.buildRustPackage {
             pname = "${rustManifest.package.name}-wasm";
-            version = "${rustManifest.package.version}-${self.shortRev or self.dirtyShortRev}";
+            version = rustManifest.package.version + revSuffix;
 
             src = lib.sourceByRegex ./. [
               "^\.cargo(/.*)?$"