oh-my-fish: revert part of #269493

wasn't building anymore because $out was referenced from the omf-install script
NixOS · Mar 18, 2024 · 62322eb · 62322eb
1 parent a3d99d0
commit 62322eb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/pkgs/by-name/oh/oh-my-fish/omf-install b/pkgs/by-name/oh/oh-my-fish/omf-install
diff --git a/pkgs/by-name/oh/oh-my-fish/package.nix b/pkgs/by-name/oh/oh-my-fish/package.nix
@@ -36,12 +36,13 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -pv $out/bin $out/share/oh-my-fish
     cp -vr * $out/share/oh-my-fish
 
-    cp -v ${substituteAll {
-      name = "omf-install";
-      src = ./omf-install;
-      OMF = placeholder "out";
-      inherit fish runtimeShell;
-    }} $out/bin/omf-install
+    cat << EOF > $out/bin/omf-install
+    #!${runtimeShell}
+    ${fish}/bin/fish \\
+      $out/share/oh-my-fish/bin/install \\
+      --noninteractive \\
+      --offline=$out/share/oh-my-fish
+    EOF
 
     chmod +x $out/bin/omf-install
     cat $out/bin/omf-install