mirrors/magic-nix-cache
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

crane.nix: Remove propagated libiconv from rust-overlay toolchain

Browse source
This commit is contained in:
Zhaofeng Li 2023-05-22 16:00:34 -06:00
parent e4c22456ef
commit 646507a02c
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crane.nix
View file

@ -12,10 +12,14 @@ let
inherit (stdenv.hostPlatform) system; inherit (stdenv.hostPlatform) system;
nightlyVersion = "2023-05-01"; nightlyVersion = "2023-05-01";
rustNightly = pkgs.rust-bin.nightly.${nightlyVersion}.default.override { rustNightly = (pkgs.rust-bin.nightly.${nightlyVersion}.default.override {
extensions = [ "rust-src" "rust-analyzer-preview" ]; extensions = [ "rust-src" "rust-analyzer-preview" ];
targets = cargoTargets; targets = cargoTargets;
}; }).overrideAttrs (old: {
# Remove the propagated libiconv since we want to add our static version
depsTargetTargetPropagated = lib.filter (d: d.pname != "libiconv")
(lib.flatten (old.depsTargetTargetPropagated or []));
});
# For easy cross-compilation in devShells # For easy cross-compilation in devShells
# We are just composing the pkgsCross.*.stdenv.cc together # We are just composing the pkgsCross.*.stdenv.cc together
@ -69,12 +73,6 @@ let
buildInputs = with pkgs; [] buildInputs = with pkgs; []
++ lib.optionals pkgs.stdenv.isDarwin [ ++ lib.optionals pkgs.stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.Security
];
nativeBuildInputs = with pkgs; []
# The Rust toolchain from rust-overlay has a dynamic libiconv in depsTargetTargetPropagated
# Our static libiconv needs to take precedence
++ lib.optionals pkgs.stdenv.isDarwin [
(libiconv.override { enableStatic = true; enableShared = false; }) (libiconv.override { enableStatic = true; enableShared = false; })
]; ];