Loading pkgs/applications/networking/browsers/firefox-bin/default.nix +3 −16 Original line number Diff line number Diff line Loading @@ -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 Loading Loading @@ -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 { Loading @@ -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 Loading @@ -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 = '' Loading Loading
pkgs/applications/networking/browsers/firefox-bin/default.nix +3 −16 Original line number Diff line number Diff line Loading @@ -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 Loading Loading @@ -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 { Loading @@ -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 Loading @@ -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 = '' Loading