summary refs log tree commit diff
path: root/pkgs/os-specific/darwin/cctools/port.nix
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-11-26 16:33:39 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2019-11-27 10:01:57 -0500
commit848d4a08a0b5aa0af8723ae1c98b32c807310245 (patch)
treeaa66672c1fe57fa4b1bf7edff5d6ea9ba95be82b /pkgs/os-specific/darwin/cctools/port.nix
parent3ebebaf9ad0b7bcb00efbc7192ef47ab11ea622b (diff)
downloadnixpkgs-848d4a08a0b5aa0af8723ae1c98b32c807310245.tar
nixpkgs-848d4a08a0b5aa0af8723ae1c98b32c807310245.tar.gz
nixpkgs-848d4a08a0b5aa0af8723ae1c98b32c807310245.tar.bz2
nixpkgs-848d4a08a0b5aa0af8723ae1c98b32c807310245.tar.lz
nixpkgs-848d4a08a0b5aa0af8723ae1c98b32c807310245.tar.xz
nixpkgs-848d4a08a0b5aa0af8723ae1c98b32c807310245.tar.zst
nixpkgs-848d4a08a0b5aa0af8723ae1c98b32c807310245.zip
cctools: readd ld-rpath-nonfinal patch
This patch is needed to build ghc, which adds -rpath flags for some
reason. Updated patch for newest cctools and reapplied.
Diffstat (limited to 'pkgs/os-specific/darwin/cctools/port.nix')
-rw-r--r--pkgs/os-specific/darwin/cctools/port.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index 6b8f26c8e66..4f350f4d683 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -40,7 +40,7 @@ let
       ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]
       ++ stdenv.lib.optional enableTapiSupport libtapi;
 
-    patches = [ ./ld-ignore-rpath-link.patch ];
+    patches = [ ./ld-ignore-rpath-link.patch ./ld-rpath-nonfinal.patch ];
 
     __propagatedImpureHostDeps = [
       # As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them