cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

firefox: take makeBinaryWrapper from buildPackages

Browse source
This commit is contained in:
Adam Joseph 2023-04-05 16:07:30 -07:00
parent c2f2239d92
commit 3e6210d2a5
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/networking/browsers/firefox/wrapper.nix
View file

@ -1,4 +1,5 @@
{ stdenv, lib, makeDesktopItem, makeWrapper, makeBinaryWrapper, lndir, config { stdenv, lib, makeDesktopItem, makeWrapper, makeBinaryWrapper, lndir, config
, buildPackages
, jq, xdg-utils, writeText , jq, xdg-utils, writeText
## various stuff that can be plugged in ## various stuff that can be plugged in
@ -275,7 +276,7 @@ let
# Symbolic link: wrap the link's target. # Symbolic link: wrap the link's target.
oldExe="$(readlink -v --canonicalize-existing "$executablePath")" oldExe="$(readlink -v --canonicalize-existing "$executablePath")"
rm "$executablePath" rm "$executablePath"
elif wrapperCmd=$(${makeBinaryWrapper.extractCmd} "$executablePath"); [[ $wrapperCmd ]]; then elif wrapperCmd=$(${buildPackages.makeBinaryWrapper.extractCmd} "$executablePath"); [[ $wrapperCmd ]]; then
# If the executable is a binary wrapper, we need to update its target to # If the executable is a binary wrapper, we need to update its target to
# point to $out, but we can't just edit the binary in-place because of length # point to $out, but we can't just edit the binary in-place because of length
# issues. So we extract the command used to create the wrapper and add the # issues. So we extract the command used to create the wrapper and add the