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

Merge branch 'feature/fix-build-rust-create-darwin' of git://github.com/marsam/nixpkgs 

Set target_os properly on darwin.
This commit is contained in:
Shea Levy 2018-07-02 11:20:25 -04:00
parent 8cf4a4725c bdf031dd4f
commit cb692ff813
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/rust/build-rust-crate.nix
View File

@ -101,7 +101,7 @@ let makeDeps = dependencies:
export CARGO_PKG_AUTHORS="${authors}"
export CARGO_CFG_TARGET_ARCH=${buildPlatform.parsed.cpu.name}
export CARGO_CFG_TARGET_OS=${buildPlatform.parsed.kernel.name}
export CARGO_CFG_TARGET_OS=${if buildPlatform.isDarwin then "macos" else buildPlatform.parsed.kernel.name}
export CARGO_CFG_TARGET_FAMILY="unix"
export CARGO_CFG_UNIX=1
export CARGO_CFG_TARGET_ENV="gnu"