diff options
| author | happysalada <raphael@megzari.com> | 2021-09-03 12:38:43 +0900 |
|---|---|---|
| committer | Raphael Megzari <raphael@megzari.com> | 2021-09-04 12:03:36 +0900 |
| commit | c9f0c6f115f4369b5047c3c3086518294541d0bf (patch) | |
| tree | 9ee7ca45af748bd7a11bd3d6027737cef754425f | |
| parent | 0585c981f11a7bfcef79f386000a8219e819e169 (diff) | |
| download | nixpkgs-c9f0c6f115f4369b5047c3c3086518294541d0bf.tar nixpkgs-c9f0c6f115f4369b5047c3c3086518294541d0bf.tar.gz nixpkgs-c9f0c6f115f4369b5047c3c3086518294541d0bf.tar.bz2 nixpkgs-c9f0c6f115f4369b5047c3c3086518294541d0bf.tar.lz nixpkgs-c9f0c6f115f4369b5047c3c3086518294541d0bf.tar.xz nixpkgs-c9f0c6f115f4369b5047c3c3086518294541d0bf.tar.zst nixpkgs-c9f0c6f115f4369b5047c3c3086518294541d0bf.zip | |
build-rust-crate: add global libiconv darwin buildInputs
| -rw-r--r-- | pkgs/build-support/rust/build-rust-crate/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/build-support/rust/default-crate-overrides.nix | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index ac4b79ae4d8..13b153315f7 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -13,6 +13,7 @@ , rust , cargo , jq +, libiconv }: let @@ -258,7 +259,7 @@ crate_: lib.makeOverridable version = crate.version; depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ]; nativeBuildInputs = [ rust stdenv.cc cargo jq ] ++ (crate.nativeBuildInputs or [ ]) ++ nativeBuildInputs_; - buildInputs = (crate.buildInputs or [ ]) ++ buildInputs_; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ] ++ (crate.buildInputs or [ ]) ++ buildInputs_; dependencies = map lib.getLib dependencies_; buildDependencies = map lib.getLib buildDependencies_; diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index bed4fda092a..e14cbcc1183 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -3,7 +3,6 @@ , pkg-config , curl , darwin -, libiconv , libgit2 , libssh2 , openssl @@ -40,7 +39,7 @@ in cargo = attrs: { buildInputs = [ openssl zlib curl ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; + ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; }; libz-sys = attrs: { |