public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14934 from retrry/cargo-fix

Browse Source 
cargo: add libiconv to buildInputs to fix darwin build
This commit is contained in:
Nikolay Amiantov 2016-04-24 00:26:33 +04:00
commit e169622bcc
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/tools/build-managers/cargo/default.nix
View File

@ -1,5 +1,7 @@
{ stdenv, cacert, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl { stdenv, lib, cacert, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
, cmake, zlib, makeWrapper }: , cmake, zlib, makeWrapper
# Darwin dependencies
, libiconv }:
with rustPlatform; with rustPlatform;
@ -20,7 +22,8 @@ buildRustPackage rec {
depsSha256 = "1x2m7ww2z8nl5ic2nds85p7ma8x0zp654jg7ay905ia95daiabzg"; 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 = '' configurePhase = ''
./configure --enable-optimize --prefix=$out --local-cargo=${cargo}/bin/cargo ./configure --enable-optimize --prefix=$out --local-cargo=${cargo}/bin/cargo