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

cargo: fix darwin build

Browse Source
This commit is contained in:
Daiderd Jordan 2017-11-05 11:13:49 +01:00
parent 2805444f96
commit cf9e6f3a18
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/compilers/rust/cargo.nix
View File

@ -1,7 +1,11 @@
{ stdenv, fetchFromGitHub, file, curl, pkgconfig, python, openssl, cmake, zlib { stdenv, fetchFromGitHub, file, curl, pkgconfig, python, openssl, cmake, zlib
, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin
, version, srcSha, cargoSha256 , version, srcSha, cargoSha256
, patches ? []}: , patches ? [] }:
let
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
name = "cargo-${version}"; name = "cargo-${version}";
@ -21,13 +25,17 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ file curl python openssl cmake zlib makeWrapper libgit2 ] buildInputs = [ file curl python openssl cmake zlib makeWrapper libgit2 ]
# FIXME: Use impure version of CoreFoundation because of missing symbols. ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ];
# CFURLSetResourcePropertyForKey is defined in the headers but there's no
# corresponding implementation in the sources from opensource.apple.com.
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation libiconv ];
LIBGIT2_SYS_USE_PKG_CONFIG=1; LIBGIT2_SYS_USE_PKG_CONFIG=1;
# FIXME: Use impure version of CoreFoundation because of missing symbols.
# CFURLSetResourcePropertyForKey is defined in the headers but there's no
# corresponding implementation in the sources from opensource.apple.com.
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE"
'';
postInstall = '' postInstall = ''
# NOTE: We override the `http.cainfo` option usually specified in # NOTE: We override the `http.cainfo` option usually specified in
# `.cargo/config`. This is an issue when users want to specify # `.cargo/config`. This is an issue when users want to specify
@ -36,8 +44,7 @@ rustPlatform.buildRustPackage rec {
wrapProgram "$out/bin/cargo" \ wrapProgram "$out/bin/cargo" \
--suffix PATH : "${rustc}/bin" \ --suffix PATH : "${rustc}/bin" \
--set CARGO_HTTP_CAINFO "${cacert}/etc/ssl/certs/ca-bundle.crt" \ --set CARGO_HTTP_CAINFO "${cacert}/etc/ssl/certs/ca-bundle.crt" \
--set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" \ --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt"
${stdenv.lib.optionalString stdenv.isDarwin ''--suffix DYLD_LIBRARY_PATH : "${rustc}/lib"''}
''; '';
checkPhase = '' checkPhase = ''