From 8ab16e40be339f7a25428ff4b99543eb65ac778a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 16 Aug 2022 17:33:13 +0100 Subject: [PATCH] pkgsCross.ppc64.linux: flatten makeFlags Before the cgange: nix-repl> pkgsCross.ppc64.linux.makeFlags [ "O=$(buildRoot)" "CC=/06pbgv2957wl3wcpd2gljml719lw123njq9dhj7h6n2pv4nwgwhl/bin/powerpc64-unknown-linux-gnu-cc" "HOSTCC=/0calwri0wxl5mbjl5q80r1hm9hchyk8a7hhayk6cdfrxgbfbia3n/bin/cc" "ARCH=powerpc" [ ... ] ] After the change: nix-repl> pkgsCross.ppc64.linux.makeFlags [ "O=$(buildRoot)" "CC=/06pbgv2957wl3wcpd2gljml719lw123njq9dhj7h6n2pv4nwgwhl/bin/powerpc64-unknown-linux-gnu-cc" "HOSTCC=/0calwri0wxl5mbjl5q80r1hm9hchyk8a7hhayk6cdfrxgbfbia3n/bin/cc" "ARCH=powerpc" "CROSS_COMPILE=powerpc64-unknown-linux-gnu-" ] --- pkgs/os-specific/linux/kernel/manual-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 377f7fc1c077..7e734a4f13ab 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -334,7 +334,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" "ARCH=${stdenv.hostPlatform.linuxArch}" - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ] ++ (stdenv.hostPlatform.linux-kernel.makeFlags or []) ++ extraMakeFlags;