diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-24 00:26:33 +0400 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-24 00:26:33 +0400 |
| commit | e169622bcc007421d9ecf5eea990b1d2b90bf110 (patch) | |
| tree | 3c8ca997ef9d15d8216721ed667ec88a097dedb6 /pkgs | |
| parent | 46e5412cfd92aea1a6eaeef84e49b8680d583513 (diff) | |
| parent | a49ffbb196441b53907c4da5953e68e3f50adca9 (diff) | |
| download | nixlib-e169622bcc007421d9ecf5eea990b1d2b90bf110.tar nixlib-e169622bcc007421d9ecf5eea990b1d2b90bf110.tar.gz nixlib-e169622bcc007421d9ecf5eea990b1d2b90bf110.tar.bz2 nixlib-e169622bcc007421d9ecf5eea990b1d2b90bf110.tar.lz nixlib-e169622bcc007421d9ecf5eea990b1d2b90bf110.tar.xz nixlib-e169622bcc007421d9ecf5eea990b1d2b90bf110.tar.zst nixlib-e169622bcc007421d9ecf5eea990b1d2b90bf110.zip | |
Merge pull request #14934 from retrry/cargo-fix
cargo: add libiconv to buildInputs to fix darwin build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/build-managers/cargo/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index c3e782a12ea7..2d7cdc365040 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -1,5 +1,7 @@ -{ stdenv, cacert, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl -, cmake, zlib, makeWrapper }: +{ stdenv, lib, cacert, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl +, cmake, zlib, makeWrapper +# Darwin dependencies +, libiconv }: with rustPlatform; @@ -20,7 +22,8 @@ buildRustPackage rec { depsSha256 = "1x2m7ww2z8nl5ic2nds85p7ma8x0zp654jg7ay905ia95daiabzg"; - buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ]; + buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ] + ++ lib.optional stdenv.isDarwin libiconv; configurePhase = '' ./configure --enable-optimize --prefix=$out --local-cargo=${cargo}/bin/cargo |