Merge pull request #153028 from NickCao/firefox-wrapper

firefox-wrapper: add replace to nativeBuildInputs instead of string i…
main
Bernardo Meurer 3 years ago committed by GitHub
commit 0bed14f8e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      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

Loading…
Cancel
Save