pyrox.dev
$xcodePath -> $SDKROOT
SDKROOT is standard. In particular, this fixes the cmake build on
Mac OS X 10.9.
+5
-5
pkgs/development/compilers/gcc/4.8/default.nix
+5
-5
pkgs/development/compilers/gcc/4.8/default.nix
···
309
309
export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
310
310
export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
311
311
'' + stdenv.lib.optionalString stdenv.isDarwin ''
312
-
if xcodePath=$(/usr/bin/xcrun --show-sdk-path); then
313
-
configureFlagsArray+=(--with-native-system-header-dir=$xcodePath/usr/include)
312
+
if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then
313
+
configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include)
314
314
makeFlagsArray+=( \
315
-
CFLAGS_FOR_BUILD=-F$xcodePath/System/Library/Frameworks \
316
-
CFLAGS_FOR_TARGET=-F$xcodePath/System/Library/Frameworks \
317
-
FLAGS_FOR_TARGET=-F$xcodePath/System/Library/Frameworks \
315
+
CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \
316
+
CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
317
+
FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
318
318
)
319
319
fi
320
320
'';
+1
-1
pkgs/development/libraries/libsamplerate/default.nix
+1
-1
pkgs/development/libraries/libsamplerate/default.nix
···
19
19
''
20
20
# need headers from the Carbon.framework in /System/Library/Frameworks to
21
21
# compile this on darwin -- not sure how to handle
22
-
NIX_CFLAGS_COMPILE+=" -I$xcodePath/System/Library/Frameworks/Carbon.framework/Versions/A/Headers"
22
+
NIX_CFLAGS_COMPILE+=" -I$SDKROOT/System/Library/Frameworks/Carbon.framework/Versions/A/Headers"
23
23
24
24
substituteInPlace examples/Makefile --replace "-fpascal-strings" ""
25
25
'';
+1
-1
pkgs/development/libraries/libsndfile/default.nix
+1
-1
pkgs/development/libraries/libsndfile/default.nix
···
14
14
# compile this on darwin -- not sure how to handle
15
15
preConfigure = stdenv.lib.optionalString stdenv.isDarwin
16
16
''
17
-
NIX_CFLAGS_COMPILE+=" -I$xcodePath/System/Library/Frameworks/Carbon.framework/Versions/A/Headers"
17
+
NIX_CFLAGS_COMPILE+=" -I$SDKROOT/System/Library/Frameworks/Carbon.framework/Versions/A/Headers"
18
18
'';
19
19
20
20
# Needed on Darwin.
+3
-3
pkgs/stdenv/nix/default.nix
+3
-3
pkgs/stdenv/nix/default.nix
···
15
15
stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
16
16
xargsFlags=" "
17
17
export MACOSX_DEPLOYMENT_TARGET=10.6
18
-
xcodePath=$(/usr/bin/xcrun --show-sdk-path 2> /dev/null || true)
19
-
export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $xcodePath/usr/include -F$xcodePath/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations"
20
-
export NIX_LDFLAGS_AFTER+=" -L$xcodePath/usr/lib"
18
+
SDKROOT=$(/usr/bin/xcrun --show-sdk-path 2> /dev/null || true)
19
+
export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT/usr/include -F$xcodePath/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations"
20
+
export NIX_LDFLAGS_AFTER+=" -L$SDKROOT/usr/lib"
21
21
'' else "");
22
22
23
23
initialPath = (import ../common-path.nix) {pkgs = pkgs;};