From 4d63ecabd35c4e2fbcc1f7b9d89917e22f2ea45b Mon Sep 17 00:00:00 2001 From: eljamm Date: Tue, 4 Nov 2025 17:42:44 +0100 Subject: [PATCH] linuxPackages.shufflecake: use wrapped gcc compiler --- pkgs/os-specific/linux/shufflecake/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix index 6871364183b5..f8bda2bcfd5b 100644 --- a/pkgs/os-specific/linux/shufflecake/default.nix +++ b/pkgs/os-specific/linux/shufflecake/default.nix @@ -23,12 +23,16 @@ stdenv.mkDerivation (finalAttrs: { libgcrypt lvm2 ]; - makeFlags = kernelModuleMakeFlags ++ [ - "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ]; - - # GCC 14 makes this an error by default, remove when fixed upstream - env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + makeFlags = + kernelModuleMakeFlags + ++ [ + "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ] + # Use wrapped gcc compiler since the unwrapped one fails to find the + # headers. + ++ lib.optionals stdenv.cc.isGNU [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; outputs = [ "out"