Merge pull request #153028 from NickCao/firefox-wrapper

firefox-wrapper: add replace to nativeBuildInputs instead of string i…
NixOS · Jan 3, 2022 · 0bed14f · 0bed14f
2 parents adf7f03 + f2f972d
commit 0bed14f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -189,7 +189,7 @@ let
         ];
       };
 
-      nativeBuildInputs = [ makeWrapper lndir ];
+      nativeBuildInputs = [ makeWrapper lndir replace ];
       buildInputs = [ browser.gtk3 ];
 
 
@@ -226,14 +226,14 @@ let
         cd "${browser}"
 
         find . -type l -print0 | while read -d $'\0' l; do
-          target="$(readlink "$l" | ${replace}/bin/replace-literal -es -- "${browser}" "$out")"
+          target="$(readlink "$l" | replace-literal -es -- "${browser}" "$out")"
           ln -sfT "$target" "$out/$l"
         done
 
         # This will not patch binaries, only "text" files.
         # Its there for the wrapper mostly.
         cd "$out"
-        ${replace}/bin/replace-literal -esfR -- "${browser}" "$out"
+        replace-literal -esfR -- "${browser}" "$out"
 
         # create the wrapper