remove protobuf, simplify CC variables

This commit is contained in:
asonix 2023-11-10 18:54:34 -06:00
parent 01ad4c7453
commit ca3f34cdac

View file

@ -40,8 +40,6 @@
cargoTarget = nixpkgs.lib.strings.concatMapStringsSep "_" (nixpkgs.lib.strings.toUpper) systemMappings.${crossSystem};
ccTarget = nixpkgs.lib.strings.concatStringsSep "_" systemMappings.${crossSystem};
toolchain = with fenix.packages.${system}; combine [
minimal.cargo
minimal.rustc
@ -58,8 +56,8 @@
CARGO_BUILD_TARGET = target;
"CARGO_TARGET_${cargoTarget}_LINKER" = "${cc}/bin/${cc.targetPrefix}cc";
"CC_${ccTarget}" = "${cc}/bin/${cc.targetPrefix}cc";
"AR_${ccTarget}" = "${cc}/bin/${cc.targetPrefix}ar";
TARGET_CC = "${cc}/bin/${cc.targetPrefix}cc";
TARGET_AR = "${cc}/bin/${cc.targetPrefix}ar";
});
in
{