Skip to content

Commit

Permalink
Merge pull request NixOS#257998 from NixOS/backport-257980-to-release…
Browse files Browse the repository at this point in the history
…-23.05

[Backport release-23.05] firefox-bin: use patchelfUnstable with --no-clobber-old-sections
  • Loading branch information
K900 authored Sep 29, 2023
2 parents ce210c8 + 622960b commit c710fc3
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion pkgs/applications/networking/browsers/firefox-bin/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
, gnupg
, runtimeShell
, systemLocale ? config.i18n.defaultLocale or "en_US"
, patchelfUnstable # have to use patchelfUnstable to support --no-clobber-old-sections
, makeWrapper
}:

let
Expand Down Expand Up @@ -57,14 +59,27 @@ let

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 {
inherit pname version;

src = fetchurl { inherit (source) url sha256; };

nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook ];
nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook wrappedPatchelf ];
buildInputs = [
gtk3
adwaita-icon-theme
Expand Down

0 comments on commit c710fc3

Please sign in to comment.