summary refs log tree commit diff
path: root/pkgs/development/tools/build-managers
diff options
context:
space:
mode:
authorTadas Barzdzius <tadas@barzdzius.lt>2016-04-23 23:08:02 +0300
committerTadas Barzdzius <tadas@barzdzius.lt>2016-04-23 23:08:02 +0300
commita49ffbb196441b53907c4da5953e68e3f50adca9 (patch)
tree573093490993ec766d84fa6e7b01e08cbe6e2f23 /pkgs/development/tools/build-managers
parenta1b39b9990f2c23f31875a5993441ea686885df3 (diff)
downloadnixpkgs-a49ffbb196441b53907c4da5953e68e3f50adca9.tar
nixpkgs-a49ffbb196441b53907c4da5953e68e3f50adca9.tar.gz
nixpkgs-a49ffbb196441b53907c4da5953e68e3f50adca9.tar.bz2
nixpkgs-a49ffbb196441b53907c4da5953e68e3f50adca9.tar.lz
nixpkgs-a49ffbb196441b53907c4da5953e68e3f50adca9.tar.xz
nixpkgs-a49ffbb196441b53907c4da5953e68e3f50adca9.tar.zst
nixpkgs-a49ffbb196441b53907c4da5953e68e3f50adca9.zip
cargo: add libiconv to buildInputs to fix darwin build
Diffstat (limited to 'pkgs/development/tools/build-managers')
-rw-r--r--pkgs/development/tools/build-managers/cargo/default.nix9
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 c3e782a12ea..2d7cdc36504 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