From 2876b56afb8c847075b6f3d3e499c112bbef170f Mon Sep 17 00:00:00 2001
From: Brian Picciano <mediocregopher@gmail.com>
Date: Wed, 30 Aug 2023 18:24:09 +0200
Subject: [PATCH] Fix how revision is embedded so that AppImage isn't always
 recompiled

---
 default.nix | 8 +-------
 release.nix | 3 ++-
 release.sh  | 3 +++
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/default.nix b/default.nix
index 6f20c08..c69a8ec 100644
--- a/default.nix
+++ b/default.nix
@@ -4,7 +4,7 @@
   hostSystem ? buildSystem,
   pkgsNix ? (import ./nix/pkgs.nix),
 
-  revision ? "",
+  revision ? "dev",
   releaseName ? "dev",
 
   bootstrap ? null,
@@ -28,7 +28,6 @@ in rec {
     name = "isle-version";
 
     inherit buildSystem hostSystem revision releaseName;
-    repoSrc = ./.;
 
     nativeBuildInputs = [ pkgsNative.git ];
 
@@ -41,11 +40,6 @@ in rec {
 
       versionFile=version
 
-      if [ "$revision" = "" ]; then
-        cp -r "$repoSrc" repoSrcCp
-        revision="$(cd repoSrcCp && git rev-parse HEAD)"
-      fi
-
       echo "Release:         $releaseName"    >> "$versionFile"
       echo "Platform:        $hostSystem"     >> "$versionFile"
       echo "Git Revision:    $revision"       >> "$versionFile"
diff --git a/release.nix b/release.nix
index 43e1ba6..bd0a0fa 100644
--- a/release.nix
+++ b/release.nix
@@ -1,5 +1,6 @@
 {
   releaseName,
+  revision,
 
   buildSystem ? builtins.currentSystem,
   pkgsNix ? (import ./nix/pkgs.nix),
@@ -12,7 +13,7 @@
   mkRelease = hostSystem: let
 
     appImage = ((import ./default.nix) {
-      inherit buildSystem hostSystem releaseName;
+      inherit buildSystem hostSystem releaseName revision;
     }).appImage;
 
   in pkgs.stdenv.mkDerivation {
diff --git a/release.sh b/release.sh
index 052957d..9fd3861 100755
--- a/release.sh
+++ b/release.sh
@@ -19,7 +19,10 @@ if [ -e "$out" ]; then
     exit 1
 fi
 
+revision=$(git rev-parse HEAD)
+
 result=$(nix-build \
+            --argstr revision "$revision" \
             --argstr releaseName "$releaseName" \
             --no-out-link \
             release.nix \