Merge pull request #180 from cmacrae/fix/lock_app_install_portability

fix: Include coreutils & git in 'lock' app's environment
emacs-twist · Oct 8, 2024 · 97165e9 · 97165e9
2 parents 629e831 + 3ecfa2e
commit 97165e9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pkgs/emacs/lock/default.nix b/pkgs/emacs/lock/default.nix
@@ -3,6 +3,7 @@
   nix,
   nixfmt-rfc-style,
   jq,
+  coreutils,
   runCommandLocal,
   writeTextFile,
   writeShellScript,
@@ -96,14 +97,15 @@ in {
     type = "app";
     program =
       (import ./write-lock-1.nix {inherit lib writeShellScript;} {
-        inherit outDir src postCommand;
+        inherit outDir src postCommand coreutils;
       })
       .outPath;
   };
 
   writerScript = {postCommandOnGeneratingLockDir}:
     writeShellApplication {
       name = "emacs-twist-write-lock";
+      runtimeInputs = [ coreutils ];
       text =
         builtins.replaceStrings [
           "@lockSrcDir@"

diff --git a/pkgs/emacs/lock/write-lock-1.nix b/pkgs/emacs/lock/write-lock-1.nix
@@ -5,6 +5,7 @@
   outDir,
   src,
   postCommand,
+  coreutils,
 }:
 writeShellScript "lock" ''
   outDir="${outDir}"
@@ -27,7 +28,7 @@ writeShellScript "lock" ''
     fi
   done
 
-  install -m 644 -t "$outDir" ${src}/*.*
+  ${coreutils}/bin/install -m 644 -t "$outDir" ${src}/*.*
 
   ${lib.optionalString (postCommand != null) ''
     cd "$outDir"