Unverified Commit 82cfa73f authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

Merge pull request #220212 from cidkidnix/fix-build-rust-create-liconv 

buildRustCrate: add libiconv to nativeBuildInputs on darwin
parents 3d57138b 856936ab

pkgs/build-support/rust/build-rust-crate/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -276,7 +276,9 @@ crate_: lib.makeOverridable 
      name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}";

      version = crate.version;

      depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ];

      nativeBuildInputs = [ rust stdenv.cc cargo jq ] ++ (crate.nativeBuildInputs or [ ]) ++ nativeBuildInputs_;

      nativeBuildInputs = [ rust stdenv.cc cargo jq ]

        ++ lib.optionals stdenv.buildPlatform.isDarwin [ libiconv ]

        ++ (crate.nativeBuildInputs or [ ]) ++ nativeBuildInputs_;

      buildInputs = lib.optionals stdenv.isDarwin [ libiconv ] ++ (crate.buildInputs or [ ]) ++ buildInputs_;

      dependencies = map lib.getLib dependencies_;

      buildDependencies = map lib.getLib buildDependencies_;