From beb349339d07b52cf2bbc77485eaed018363ea7a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 17 Sep 2016 08:44:38 -0400 Subject: [PATCH] darwin.cctools: Fix build on linux (cherry picked from commit 11f4921cdf7da0e50b48363814d23aaf568cca2e) --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 919e78bf64ea..64db245f461e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10865,7 +10865,10 @@ in xctoolchain = xcode.toolchain; }; - cctools = (callPackage ../os-specific/darwin/cctools/port.nix { inherit libobjc; }).native; + cctools = (callPackage ../os-specific/darwin/cctools/port.nix { + inherit libobjc; + stdenv = if stdenv.isDarwin then stdenv else libcxxStdenv; + }).native; cf-private = callPackage ../os-specific/darwin/cf-private { inherit (apple-source-releases) CF;