Revert "firefox-bin: remove workaround"

This reverts commit 2893902201.
This commit is contained in:
K900 2023-11-17 08:24:04 +03:00
parent b1cc48b95a
commit 78ad4224ad

View File

@ -20,6 +20,7 @@
, runtimeShell , runtimeShell
, systemLocale ? config.i18n.defaultLocale or "en_US" , systemLocale ? config.i18n.defaultLocale or "en_US"
, patchelfUnstable # have to use patchelfUnstable to support --no-clobber-old-sections , patchelfUnstable # have to use patchelfUnstable to support --no-clobber-old-sections
, makeWrapper
}: }:
let let
@ -57,6 +58,20 @@ let
source = lib.findFirst (sourceMatches mozLocale) defaultSource sources; source = lib.findFirst (sourceMatches mozLocale) defaultSource sources;
pname = "firefox-${channel}-bin-unwrapped"; 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 in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -64,7 +79,7 @@ stdenv.mkDerivation {
src = fetchurl { inherit (source) url sha256; }; src = fetchurl { inherit (source) url sha256; };
nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook patchelfUnstable ]; nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook wrappedPatchelf ];
buildInputs = [ buildInputs = [
gtk3 gtk3
adwaita-icon-theme adwaita-icon-theme
@ -80,8 +95,6 @@ stdenv.mkDerivation {
appendRunpaths = [ appendRunpaths = [
"${pipewire}/lib" "${pipewire}/lib"
]; ];
# Firefox uses "relrhack" to manually process relocations from a fixed offset
patchelfFlags = [ "--no-clobber-old-sections" ];
installPhase = installPhase =
'' ''