From f1897116d04d99a4491ef3a8db6acf54dd0035c6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 7 Nov 2016 17:43:20 -0600 Subject: [PATCH] xcbuild: temporarily fix cflags/ldflags This gets everything to build. adv_cmds: remove NIX_LDFLAGS - unneeded --- pkgs/development/tools/xcbuild/setup-hook.sh | 2 +- .../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh index 4a0f74b0e6d..72ffb7b128c 100644 --- a/pkgs/development/tools/xcbuild/setup-hook.sh +++ b/pkgs/development/tools/xcbuild/setup-hook.sh @@ -3,7 +3,7 @@ xcbuildPhase() { echo "running xcodebuild" - xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" + xcodebuild runHook postConfigure } diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index f9e8207d8bf..e5600f3962d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; buildInputs = [ xcbuild libcxx ]; - #NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; meta = { platforms = stdenv.lib.platforms.darwin;