pyrox.dev
lol
Merge pull request #14934 from retrry/cargo-fix
cargo: add libiconv to buildInputs to fix darwin build
+6
-3
+6
-3
pkgs/development/tools/build-managers/cargo/default.nix
+6
-3
pkgs/development/tools/build-managers/cargo/default.nix
···
1
-
{ stdenv, cacert, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
2
-
, cmake, zlib, makeWrapper }:
1
+
{ stdenv, lib, cacert, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
2
+
, cmake, zlib, makeWrapper
3
+
# Darwin dependencies
4
+
, libiconv }:
3
5
4
6
with rustPlatform;
5
7
···
20
22
21
23
depsSha256 = "1x2m7ww2z8nl5ic2nds85p7ma8x0zp654jg7ay905ia95daiabzg";
22
24
23
-
buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ];
25
+
buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ]
26
+
++ lib.optional stdenv.isDarwin libiconv;
24
27
25
28
configurePhase = ''
26
29
./configure --enable-optimize --prefix=$out --local-cargo=${cargo}/bin/cargo