From a49ffbb196441b53907c4da5953e68e3f50adca9 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Sat, 23 Apr 2016 23:08:02 +0300 Subject: [PATCH] cargo: add libiconv to buildInputs to fix darwin build --- pkgs/development/tools/build-managers/cargo/default.nix | 9 ++++++--- 1 file 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