public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

$xcodePath -> $SDKROOT

Browse Source 
SDKROOT is standard. In particular, this fixes the cmake build on
Mac OS X 10.9.
This commit is contained in:
Eelco Dolstra 2014-07-24 21:53:46 +02:00
parent bf0d518c67
commit ac8775dd96
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/gcc/4.8/default.nix
View File

@ -309,12 +309,12 @@ stdenv.mkDerivation ({
export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET" export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
'' + stdenv.lib.optionalString stdenv.isDarwin '' '' + stdenv.lib.optionalString stdenv.isDarwin ''
if xcodePath=$(/usr/bin/xcrun --show-sdk-path); then if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then
configureFlagsArray+=(--with-native-system-header-dir=$xcodePath/usr/include) configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include)
makeFlagsArray+=( \ makeFlagsArray+=( \
CFLAGS_FOR_BUILD=-F$xcodePath/System/Library/Frameworks \ CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \
CFLAGS_FOR_TARGET=-F$xcodePath/System/Library/Frameworks \ CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
FLAGS_FOR_TARGET=-F$xcodePath/System/Library/Frameworks \ FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
) )
fi fi
''; '';

2
pkgs/development/libraries/libsamplerate/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
'' ''
# need headers from the Carbon.framework in /System/Library/Frameworks to # need headers from the Carbon.framework in /System/Library/Frameworks to
# compile this on darwin -- not sure how to handle # compile this on darwin -- not sure how to handle
NIX_CFLAGS_COMPILE+=" -I$xcodePath/System/Library/Frameworks/Carbon.framework/Versions/A/Headers" NIX_CFLAGS_COMPILE+=" -I$SDKROOT/System/Library/Frameworks/Carbon.framework/Versions/A/Headers"
substituteInPlace examples/Makefile --replace "-fpascal-strings" "" substituteInPlace examples/Makefile --replace "-fpascal-strings" ""
''; '';

2
pkgs/development/libraries/libsndfile/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
# compile this on darwin -- not sure how to handle # compile this on darwin -- not sure how to handle
preConfigure = stdenv.lib.optionalString stdenv.isDarwin preConfigure = stdenv.lib.optionalString stdenv.isDarwin
'' ''
NIX_CFLAGS_COMPILE+=" -I$xcodePath/System/Library/Frameworks/Carbon.framework/Versions/A/Headers" NIX_CFLAGS_COMPILE+=" -I$SDKROOT/System/Library/Frameworks/Carbon.framework/Versions/A/Headers"
''; '';
# Needed on Darwin. # Needed on Darwin.

6
pkgs/stdenv/nix/default.nix
View File

@ -15,9 +15,9 @@ import ../generic rec {
stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
xargsFlags=" " xargsFlags=" "
export MACOSX_DEPLOYMENT_TARGET=10.6 export MACOSX_DEPLOYMENT_TARGET=10.6
xcodePath=$(/usr/bin/xcrun --show-sdk-path 2> /dev/null || true) SDKROOT=$(/usr/bin/xcrun --show-sdk-path 2> /dev/null || true)
export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $xcodePath/usr/include -F$xcodePath/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations" export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT/usr/include -F$xcodePath/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations"
export NIX_LDFLAGS_AFTER+=" -L$xcodePath/usr/lib" export NIX_LDFLAGS_AFTER+=" -L$SDKROOT/usr/lib"
'' else ""); '' else "");
initialPath = (import ../common-path.nix) {pkgs = pkgs;}; initialPath = (import ../common-path.nix) {pkgs = pkgs;};