diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 15:53:30 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 15:56:09 +0200 |
| commit | 0d8014f6fcdf7fbbea93f5bf8fd1750da66d4d2c (patch) | |
| tree | 96115aa6131813430693cc9a5c32d3324e34875c /pkgs/stdenv/nix | |
| parent | 06536251c9c697eba324b18d9df8d0d95938048f (diff) | |
| download | nixpkgs-0d8014f6fcdf7fbbea93f5bf8fd1750da66d4d2c.tar nixpkgs-0d8014f6fcdf7fbbea93f5bf8fd1750da66d4d2c.tar.gz nixpkgs-0d8014f6fcdf7fbbea93f5bf8fd1750da66d4d2c.tar.bz2 nixpkgs-0d8014f6fcdf7fbbea93f5bf8fd1750da66d4d2c.tar.lz nixpkgs-0d8014f6fcdf7fbbea93f5bf8fd1750da66d4d2c.tar.xz nixpkgs-0d8014f6fcdf7fbbea93f5bf8fd1750da66d4d2c.tar.zst nixpkgs-0d8014f6fcdf7fbbea93f5bf8fd1750da66d4d2c.zip | |
Darwin: Search for libraries in $sdk/usr/lib
This required adding a new environment variable NIX_LDFLAGS_AFTER that ensures that the -L.../usr/lib flag happens last.
Diffstat (limited to 'pkgs/stdenv/nix')
| -rw-r--r-- | pkgs/stdenv/nix/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 84bcea7f643..ba693443b05 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -17,12 +17,10 @@ import ../generic rec { xargsFlags=" " fi '' + (if stdenv.isDarwin then '' - export NIX_CFLAGS_COMPILE="--sysroot=/var/empty" - if xcodePath=$(/usr/bin/xcrun --show-sdk-path 2> /dev/null); then - NIX_CFLAGS_COMPILE+=" -idirafter $xcodePath/usr/include -F$xcodePath/System/Library/Frameworks" - else - NIX_CFLAGS_COMPILE+=" -idirafter /usr/include -F/System/Library/Frameworks" - fi + export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty" + xcodePath=$(/usr/bin/xcrun --show-sdk-path 2> /dev/null || true) + export NIX_CFLAGS_COMPILE+=" -idirafter $xcodePath/usr/include -F$xcodePath/System/Library/Frameworks" + export NIX_LDFLAGS_AFTER+=" -L$xcodePath/usr/lib" '' else ""); initialPath = (import ../common-path.nix) {pkgs = pkgs;}; |