From 4da661862ff5ffe8191835d283bd497bfa03a745 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Mon, 22 May 2023 21:15:49 -0600 Subject: [PATCH] darwin.libtapi: Build with libcxxStdenv on non-Darwin This fixes linking in cctools-port which is built with libcxxStdenv. --- pkgs/top-level/darwin-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index b6e70772d04a2..99e83d41292dc 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -216,7 +216,9 @@ impure-cmds // appleSourcePackages // chooseLibs // { # As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { }; - libtapi = callPackage ../os-specific/darwin/libtapi {}; + libtapi = callPackage ../os-specific/darwin/libtapi { + stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv; + }; ios-deploy = callPackage ../os-specific/darwin/ios-deploy {};