From ca3f34cdac0f2ef324acae76553ddd8387b56ed1 Mon Sep 17 00:00:00 2001 From: asonix Date: Fri, 10 Nov 2023 18:54:34 -0600 Subject: [PATCH] remove protobuf, simplify CC variables --- flake.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 7f25436..44b1f03 100644 --- a/flake.nix +++ b/flake.nix @@ -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 {