From ead242498132ae3b4a2c547f7cadbccb26c9c5a6 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sun, 16 Oct 2016 20:46:36 -0400 Subject: [PATCH] cctools: fix triple for the assembler This was breaking `boost155` and would probably break anything else that calls `as` with no explicit architecture. --- pkgs/os-specific/darwin/cctools/port.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index af713bf61dd..2f13277d70c 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -22,6 +22,9 @@ 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 ]; enableParallelBuilding = true;