summary refs log tree commit diff
path: root/pkgs/os-specific/darwin/cctools/port.nix
diff options
context:
space:
mode:
authorDan Peebles <pumpkin@me.com>2017-04-09 17:32:37 -0400
committerDan Peebles <pumpkin@me.com>2017-04-09 17:32:37 -0400
commitc595d5ed3dd05e278c12e740d32bcb3650b6f069 (patch)
tree4bd05af791e51c0f9e55a62c23bc00b8788ed00d /pkgs/os-specific/darwin/cctools/port.nix
parentd93f2c38659b6ec5a61428ce504626e742c2a361 (diff)
downloadnixpkgs-c595d5ed3dd05e278c12e740d32bcb3650b6f069.tar
nixpkgs-c595d5ed3dd05e278c12e740d32bcb3650b6f069.tar.gz
nixpkgs-c595d5ed3dd05e278c12e740d32bcb3650b6f069.tar.bz2
nixpkgs-c595d5ed3dd05e278c12e740d32bcb3650b6f069.tar.lz
nixpkgs-c595d5ed3dd05e278c12e740d32bcb3650b6f069.tar.xz
nixpkgs-c595d5ed3dd05e278c12e740d32bcb3650b6f069.tar.zst
nixpkgs-c595d5ed3dd05e278c12e740d32bcb3650b6f069.zip
cctools-port: 886 -> 895
Diffstat (limited to 'pkgs/os-specific/darwin/cctools/port.nix')
-rw-r--r--pkgs/os-specific/darwin/cctools/port.nix10
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index 202426e7872..0154d395216 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -6,13 +6,13 @@
 let
   baseParams = rec {
     name = "cctools-port-${version}";
-    version = "886";
+    version = "895";
 
     src = fetchFromGitHub {
       owner  = "tpoechtrager";
       repo   = "cctools-port";
-      rev    = "02f0b8ecd87a3951653d838a321ae744815e21a5";
-      sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1";
+      rev    = "2e569d765440b8cd6414a695637617521aa2375b"; # From branch 895-ld64-274.2
+      sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52";
     };
 
     buildInputs = [ autoconf automake libtool_2 libuuid ] ++
@@ -22,10 +22,6 @@ let
 
     patches = [
       ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch
-    ] ++ stdenv.lib.optionals stdenv.isDarwin [
-      # See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed.
-      ./undo-unknown-triple.patch
-      ./ld-tbd-v2.patch
     ];
 
     enableParallelBuilding = true;