diff options
| author | K900 <me@0upti.me> | 2023-10-02 08:07:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-02 08:07:03 +0300 |
| commit | 03fddbfb87e99d1505eb483213988c1937fb2f21 (patch) | |
| tree | b20be8cb041b7c19d22f0c85800cc99d154eedbc /pkgs/applications/networking/browsers | |
| parent | 3bf47679b788c3dd77c553a92b7414b26ee843f6 (diff) | |
| parent | 2893902201e2cb2cebaaf3a8da61622675f20887 (diff) | |
| download | nixpkgs-03fddbfb87e99d1505eb483213988c1937fb2f21.tar nixpkgs-03fddbfb87e99d1505eb483213988c1937fb2f21.tar.gz nixpkgs-03fddbfb87e99d1505eb483213988c1937fb2f21.tar.bz2 nixpkgs-03fddbfb87e99d1505eb483213988c1937fb2f21.tar.lz nixpkgs-03fddbfb87e99d1505eb483213988c1937fb2f21.tar.xz nixpkgs-03fddbfb87e99d1505eb483213988c1937fb2f21.tar.zst nixpkgs-03fddbfb87e99d1505eb483213988c1937fb2f21.zip | |
Merge pull request #256525 from K900/auto-patchelf-flags
autoPatchelfHook: add `patchelfFlags` option
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox-bin/default.nix | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 8130f9f7758..59c87321da3 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -20,7 +20,6 @@ , runtimeShell , systemLocale ? config.i18n.defaultLocale or "en_US" , patchelfUnstable # have to use patchelfUnstable to support --no-clobber-old-sections -, makeWrapper }: let @@ -58,20 +57,6 @@ let source = lib.findFirst (sourceMatches mozLocale) defaultSource sources; pname = "firefox-${channel}-bin-unwrapped"; - - # FIXME: workaround for not being able to pass flags to patchelf - # Remove after https://github.com/NixOS/nixpkgs/pull/256525 - wrappedPatchelf = stdenv.mkDerivation { - pname = "patchelf-wrapped"; - inherit (patchelfUnstable) version; - - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p $out/bin - makeWrapper ${patchelfUnstable}/bin/patchelf $out/bin/patchelf --append-flags "--no-clobber-old-sections" - ''; - }; in stdenv.mkDerivation { @@ -79,7 +64,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (source) url sha256; }; - nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook wrappedPatchelf ]; + nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook patchelfUnstable ]; buildInputs = [ gtk3 adwaita-icon-theme @@ -95,6 +80,8 @@ stdenv.mkDerivation { appendRunpaths = [ "${pipewire.lib}/lib" ]; + # Firefox uses "relrhack" to manually process relocations from a fixed offset + patchelfFlags = [ "--no-clobber-old-sections" ]; installPhase = '' |