summary refs log tree commit diff
path: root/pkgs/development/tools/misc/patchelf/default.nix
diff options
context:
space:
mode:
authorAdam Joseph <adam@westernsemico.com>2022-06-18 22:12:52 -0700
committerAdam Joseph <adam@westernsemico.com>2022-06-19 15:16:26 -0700
commit12618e79868f81165f3fb5ae614183b715849ab6 (patch)
tree2523f081038ec17583e1b7e3c130d1645b3fee9d /pkgs/development/tools/misc/patchelf/default.nix
parentd83c9aaf153a8f130c30c3d814657b030e468888 (diff)
downloadnixpkgs-12618e79868f81165f3fb5ae614183b715849ab6.tar
nixpkgs-12618e79868f81165f3fb5ae614183b715849ab6.tar.gz
nixpkgs-12618e79868f81165f3fb5ae614183b715849ab6.tar.bz2
nixpkgs-12618e79868f81165f3fb5ae614183b715849ab6.tar.lz
nixpkgs-12618e79868f81165f3fb5ae614183b715849ab6.tar.xz
nixpkgs-12618e79868f81165f3fb5ae614183b715849ab6.tar.zst
nixpkgs-12618e79868f81165f3fb5ae614183b715849ab6.zip
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.
Diffstat (limited to 'pkgs/development/tools/misc/patchelf/default.nix')
-rw-r--r--pkgs/development/tools/misc/patchelf/default.nix10
1 files changed, 10 insertions, 0 deletions
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;