From f1f7296885109b8c126acf47915ebc678beaf8a2 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 23 Oct 2017 10:23:34 +0200 Subject: [PATCH] cargo: fix darwin build --- pkgs/development/compilers/rust/cargo.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index ec890b3bf7a..5225e95b1e1 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, file, curl, pkgconfig, python, openssl, cmake, zlib -, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2 +, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin , version, srcSha, cargoSha256 , patches ? []}: @@ -21,7 +21,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ file curl python openssl cmake zlib makeWrapper libgit2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + # 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. + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation libiconv ]; LIBGIT2_SYS_USE_PKG_CONFIG=1;