From 12618e79868f81165f3fb5ae614183b715849ab6 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 18 Jun 2022 22:12:52 -0700 Subject: patchelf: if targetPlatform.isMips: apply patchelf/pull/380 This PR applies the patches which fix a MIPS-specific bug in patchelf. The patches are applied only if targetPlatform.isMips in order to: 1. Not cause a mass-rebuild on the mainstream platforms 2. Make this PR acceptable for inclusion in `master` rather than `staging`. This is the very last commit needed in order for Hydra to be able to produce a bootstrap-files tarball for mips64el (the other one is in `staging-next`). This PR can be reverted after the next release of patchelf lands in nixpkgs. --- pkgs/development/tools/misc/patchelf/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'pkgs/development/tools/misc/patchelf/default.nix') diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index d51af9ca332..855ae40fc5f 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -15,6 +15,16 @@ stdenv.mkDerivation rec { }; strictDeps = true; + + patches = + # This patch fixes a MIPS-specific bug in patchelf; we want Hydra + # to generate a bootstrap-files tarball for MIPS that includes + # this fix. The patches below can be dropped on the next version bump. + lib.optionals stdenv.targetPlatform.isMips [ + # https://github.com/NixOS/patchelf/pull/380 + ./patches/380.patch + ]; + setupHook = [ ./setup-hook.sh ]; enableParallelBuilding = true; -- cgit 1.4.1