diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2018-10-26 16:06:56 +0100 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2018-10-26 16:06:56 +0100 |
commit | 1b47b95638cb8a10248baeaad3d5e91a3a39fdd3 (patch) | |
tree | 9fc559e1f511b42a7aba3edd7eeb9a8613069bb3 /pkgs/development/compilers/rust | |
parent | 0d64e81ce6166eb5920e01563b78b9cb6e2c2043 (diff) | |
download | nixlib-1b47b95638cb8a10248baeaad3d5e91a3a39fdd3.tar nixlib-1b47b95638cb8a10248baeaad3d5e91a3a39fdd3.tar.gz nixlib-1b47b95638cb8a10248baeaad3d5e91a3a39fdd3.tar.bz2 nixlib-1b47b95638cb8a10248baeaad3d5e91a3a39fdd3.tar.lz nixlib-1b47b95638cb8a10248baeaad3d5e91a3a39fdd3.tar.xz nixlib-1b47b95638cb8a10248baeaad3d5e91a3a39fdd3.tar.zst nixlib-1b47b95638cb8a10248baeaad3d5e91a3a39fdd3.zip |
cargo: fix darwin build
It depends the Security framework now.
Diffstat (limited to 'pkgs/development/compilers/rust')
-rw-r--r-- | pkgs/development/compilers/rust/cargo.nix | 9 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/default.nix | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 25a71965e0b4..02ea7ebbbfbf 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,13 +1,10 @@ { stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib -, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin +, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2 +, CoreFoundation, Security , version , patches ? [] , src }: -let - inherit (darwin.apple_sdk.frameworks) CoreFoundation; -in - rustPlatform.buildRustPackage rec { name = "cargo-${version}"; inherit version src patches; @@ -24,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; LIBGIT2_SYS_USE_PKG_CONFIG=1; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 7e95f3c6caee..a925127596d5 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -1,4 +1,5 @@ { stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl +, CoreFoundation, Security , targets ? [] , targetToolchains ? [] , targetPatches ? [] @@ -44,8 +45,7 @@ in rec { cargo = callPackage ./cargo.nix rec { version = cargoVersion; - inherit src; - inherit stdenv; + inherit src stdenv CoreFoundation Security; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo }; |