modules: use pkgs.substituteAll where applicable

I misread the implmentation, and thought it only worked for derivations
that produced directories, so hadn't been using it until now.

1 files changed, 9 insertions, 9 deletions

diff --git a/modules/shell/git/default.nix b/modules/shell/git/default.nix
index 2f61a984aff3..8a7c10bfdb47 100644
--- a/modules/shell/git/default.nix
+++ b/modules/shell/git/default.nix
@@ -1,13 +1,13 @@
 { pkgs, ... }:
 
 let
-  mozlz4_textconv = pkgs.runCommand "mozlz4-textconv" {
+  mozlz4_textconv = pkgs.substituteAll {
+    src = diff/mozlz4.in;
+    isExecutable = true;
+
     inherit (pkgs) execline mozlz4a;
     python = pkgs.python3;
-  } ''
-    substituteAll ${diff/mozlz4.in} $out
-    chmod +x $out
-  '';
+  };
 
   # Git only supports absolute paths for this, so give it a wrapper
   # program that execs the msmtp in PATH.
@@ -16,16 +16,16 @@ let
     msmtp $@
   '';
 
-  config = pkgs.runCommand "gitconfig" {
+  config = pkgs.substituteAll {
+    src = ./config.in;
+
     inherit mozlz4_textconv;
     python = pkgs.python3;
     smtpServer = sendmail;
     attributesfile = ./attributes;
     ignorefile = ./ignore;
     preferLocalBuild = true;
-  } ''
-    substituteAll ${./config.in} $out
-  '';
+  };
 
 in
 {