diff options
author | Vladimír Čunát <vladimir.cunat@nic.cz> | 2022-09-28 09:45:11 +0200 |
---|---|---|
committer | Vladimír Čunát <vladimir.cunat@nic.cz> | 2022-09-28 09:45:11 +0200 |
commit | 292756e9fff8c77e336040323b50b4aee84cd999 (patch) | |
tree | 8bcf96dd28467914b5c7b744a108f4de22bb111a /pkgs/development/compilers/rust | |
parent | c2e78585068ad22c51983efb9414e661ae5a6581 (diff) | |
parent | b6fc00b8f4bc25a72c43320b70082bbee06321db (diff) | |
download | nixlib-292756e9fff8c77e336040323b50b4aee84cd999.tar nixlib-292756e9fff8c77e336040323b50b4aee84cd999.tar.gz nixlib-292756e9fff8c77e336040323b50b4aee84cd999.tar.bz2 nixlib-292756e9fff8c77e336040323b50b4aee84cd999.tar.lz nixlib-292756e9fff8c77e336040323b50b4aee84cd999.tar.xz nixlib-292756e9fff8c77e336040323b50b4aee84cd999.tar.zst nixlib-292756e9fff8c77e336040323b50b4aee84cd999.zip |
Merge #190093: rustc: propagate libiconv on darwin
...into staging
Diffstat (limited to 'pkgs/development/compilers/rust')
-rw-r--r-- | pkgs/development/compilers/rust/cargo.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/rustc.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 01b219714382..6a4d01de5ef4 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,7 +1,7 @@ { lib, stdenv, pkgsHostHost , file, curl, pkg-config, python3, openssl, cmake, zlib , installShellFiles, makeWrapper, cacert, rustPlatform, rustc -, CoreFoundation, Security +, libiconv, CoreFoundation, Security }: rustPlatform.buildRustPackage { @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage { (lib.getDev pkgsHostHost.curl) ]; buildInputs = [ cacert file curl python3 openssl zlib ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]; # cargo uses git-rs which is made for a version of libgit2 from recent master that # is not compatible with the current version in nixpkgs. diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index bb5bc1bb1d73..60ee42d4649b 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -145,9 +145,11 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openssl ] - ++ optionals stdenv.isDarwin [ libiconv Security ] + ++ optionals stdenv.isDarwin [ Security ] ++ optional (!withBundledLLVM) llvmShared; + depsTargetTargetPropagated = optionals stdenv.isDarwin [ libiconv ]; + outputs = [ "out" "man" "doc" ]; setOutputFlags = false; |