substituteAll was deprecated

Author: josh

pkgs/kitty-conf.nix

@@ -13,12 +13,11 @@ stdenvNoCC.mkDerivation {
 
   __structuredAttrs = true;
 
-  env = {
-    theme = "rosepine";
-  };
+  theme = "rosepine";
 
   buildCommand = ''
-    substituteAll ${./kitty.conf} kitty.conf
+    substitute ${./kitty.conf} kitty.conf \
+      --replace-fail '@theme@' "$theme"
 
     (
       echo "# BEGIN_KITTY_THEME"

pkgs/launchd-exec.nix

@@ -7,7 +7,8 @@ stdenv.mkDerivation {
   version = "0.1.0";
 
   buildCommand = ''
-    substituteAll ${./launchd-exec.c} launchd-exec.c
+    substitute ${./launchd-exec.c} launchd-exec.c \
+      --replace-fail '@version@' "$version"
     mkdir -p $out/bin
     $CC launchd-exec.c -o $out/bin/launchd-exec
   '';

pkgs/tmux-conf.nix

@@ -94,14 +94,16 @@ stdenvNoCC.mkDerivation {
 
   __structuredAttrs = true;
 
-  env = {
-    inherit (tmuxPlugins) sensible yank;
-    inherit sourceTheme;
-    inherit interactiveShell;
-  };
+  inherit (tmuxPlugins) sensible yank;
+  inherit sourceTheme;
+  inherit interactiveShell;
 
   buildCommand = ''
-    substituteAll ${./tmux.conf} $out
+    substitute ${./tmux.conf} $out \
+      --replace-fail '@sensible@' "$sensible" \
+      --replace-fail '@yank@' "$yank" \
+      --replace-fail '@sourceTheme@' "$sourceTheme" \
+      --replace-fail '@interactiveShell@' "$interactiveShell"
   '';
 
   meta = {

pkgs/wezterm-config.nix

@@ -33,13 +33,13 @@ stdenvNoCC.mkDerivation {
 
   __structuredAttrs = true;
 
-  env = {
-    theme = if theme == null then "" else theme;
-    colorScheme = if theme == null then "" else colorScheme;
-  };
+  theme = if theme == null then "" else theme;
+  colorScheme = if theme == null then "" else colorScheme;
 
   buildCommand = ''
-    substituteAll "${./wezterm-config.lua}" "$out"
+    substitute "${./wezterm-config.lua}" "$out" \
+      --replace-fail '@theme@' "$theme" \
+      --replace-fail '@colorScheme@' "$colorScheme"
   '';
 
   meta = {

pkgs/zellij-config.nix

@@ -19,18 +19,17 @@ stdenvNoCC.mkDerivation {
 
   __structuredAttrs = true;
 
-  env = {
-    theme =
-      if zellijTheme == null then
-        "default"
-      else
-        assert (lib.asserts.assertOneOf "zellijTheme" zellijTheme validThemes);
-        zellijTheme;
-  };
+  theme =
+    if zellijTheme == null then
+      "default"
+    else
+      assert (lib.asserts.assertOneOf "zellijTheme" zellijTheme validThemes);
+      zellijTheme;
 
   buildCommand = ''
     mkdir $out
-    substituteAll ${./zellij.kdl} $out/config.kdl
+    substitute ${./zellij.kdl} $out/config.kdl \
+      --replace-fail '@theme@' "$theme"
   '';
 
   meta = {