From 954600a7c0bc7767c2297ebbb8d3f202673d676d Mon Sep 17 00:00:00 2001 From: ccicnce113424 Date: Fri, 1 Aug 2025 13:42:29 +0800 Subject: [PATCH] pkgsLLVM.linuxPackages: fix kernel modules building by setting makeFlags --- pkgs/os-specific/linux/acer-wmi-battery/default.nix | 3 +++ pkgs/os-specific/linux/ajantv2/default.nix | 3 +++ pkgs/os-specific/linux/asus-ec-sensors/default.nix | 3 ++- pkgs/os-specific/linux/facetimehd/default.nix | 3 ++- pkgs/os-specific/linux/hpuefi-mod/default.nix | 3 ++- pkgs/os-specific/linux/it87/default.nix | 3 ++- pkgs/os-specific/linux/kvmfr/default.nix | 3 ++- pkgs/os-specific/linux/liquidtux/default.nix | 3 ++- pkgs/os-specific/linux/new-lg4ff/default.nix | 2 ++ pkgs/os-specific/linux/r8125/default.nix | 3 ++- pkgs/os-specific/linux/system76-io/default.nix | 3 +++ pkgs/os-specific/linux/system76/default.nix | 3 +++ pkgs/os-specific/linux/tt-kmd/default.nix | 3 +++ pkgs/os-specific/linux/universal-pidff/default.nix | 3 ++- pkgs/os-specific/linux/vendor-reset/default.nix | 3 ++- pkgs/os-specific/linux/xone/default.nix | 3 ++- pkgs/os-specific/linux/xpad-noone/default.nix | 3 +++ 17 files changed, 40 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/acer-wmi-battery/default.nix b/pkgs/os-specific/linux/acer-wmi-battery/default.nix index 5eac3ff6a1a3..471a9c3f0b4d 100644 --- a/pkgs/os-specific/linux/acer-wmi-battery/default.nix +++ b/pkgs/os-specific/linux/acer-wmi-battery/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: let @@ -20,6 +21,8 @@ stdenv.mkDerivation { hash = "sha256-mI6Ob9BmNfwqT3nndWf3jkz8f7tV10odkTnfApsNo+A="; }; + makeFlags = kernelModuleMakeFlags; + postPatch = '' substituteInPlace Makefile \ --replace-fail '/lib/modules/$(shell uname -r)/build' ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build diff --git a/pkgs/os-specific/linux/ajantv2/default.nix b/pkgs/os-specific/linux/ajantv2/default.nix index 39518f00d522..d9e664b1c3d0 100644 --- a/pkgs/os-specific/linux/ajantv2/default.nix +++ b/pkgs/os-specific/linux/ajantv2/default.nix @@ -1,6 +1,7 @@ { stdenv, kernel, + kernelModuleMakeFlags, libajantv2, }: stdenv.mkDerivation { @@ -18,6 +19,8 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernelModuleMakeFlags; + preBuild = '' chmod -R +w ../../ ''; diff --git a/pkgs/os-specific/linux/asus-ec-sensors/default.nix b/pkgs/os-specific/linux/asus-ec-sensors/default.nix index 681fd0556d8f..4a6337ec6e10 100644 --- a/pkgs/os-specific/linux/asus-ec-sensors/default.nix +++ b/pkgs/os-specific/linux/asus-ec-sensors/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = [ + makeFlags = kernelModuleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}" ]; diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index d4e7841518f9..c766744fa706 100644 --- a/pkgs/os-specific/linux/facetimehd/default.nix +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = [ + makeFlags = kernelModuleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/hpuefi-mod/default.nix b/pkgs/os-specific/linux/hpuefi-mod/default.nix index ec22be081b7f..1bbd762a9370 100644 --- a/pkgs/os-specific/linux/hpuefi-mod/default.nix +++ b/pkgs/os-specific/linux/hpuefi-mod/default.nix @@ -2,6 +2,7 @@ stdenv, fetchzip, kernel, + kernelModuleMakeFlags, lib, }: stdenv.mkDerivation (finalAttrs: { @@ -17,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = kernel.moduleBuildDependencies; strictDeps = true; - makeFlags = [ + makeFlags = kernelModuleMakeFlags ++ [ "KVERS=${kernel.modDirVersion}" "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "DESTDIR=$(out)" diff --git a/pkgs/os-specific/linux/it87/default.nix b/pkgs/os-specific/linux/it87/default.nix index a0f42ef1a909..a448f7600756 100644 --- a/pkgs/os-specific/linux/it87/default.nix +++ b/pkgs/os-specific/linux/it87/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { sed -i 's|depmod|#depmod|' Makefile ''; - makeFlags = [ + makeFlags = kernelModuleMakeFlags ++ [ "TARGET=${kernel.modDirVersion}" "KERNEL_MODULES=${kernel.dev}/lib/modules/${kernel.modDirVersion}" "MODDESTDIR=$(out)/lib/modules/${kernel.modDirVersion}/kernel/drivers/hwmon" diff --git a/pkgs/os-specific/linux/kvmfr/default.nix b/pkgs/os-specific/linux/kvmfr/default.nix index 513e5d001e34..6db5f935593b 100644 --- a/pkgs/os-specific/linux/kvmfr/default.nix +++ b/pkgs/os-specific/linux/kvmfr/default.nix @@ -2,6 +2,7 @@ lib, stdenv, kernel, + kernelModuleMakeFlags, looking-glass-client, }: @@ -17,7 +18,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = [ + makeFlags = kernelModuleMakeFlags ++ [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/liquidtux/default.nix b/pkgs/os-specific/linux/liquidtux/default.nix index dde260e718af..ee5afc3dfb04 100644 --- a/pkgs/os-specific/linux/liquidtux/default.nix +++ b/pkgs/os-specific/linux/liquidtux/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = [ + makeFlags = kernelModuleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/new-lg4ff/default.nix b/pkgs/os-specific/linux/new-lg4ff/default.nix index 4de25e6b7294..3a25fb8556b3 100644 --- a/pkgs/os-specific/linux/new-lg4ff/default.nix +++ b/pkgs/os-specific/linux/new-lg4ff/default.nix @@ -2,6 +2,7 @@ lib, stdenv, kernel, + kernelModuleMakeFlags, fetchFromGitHub, }: @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { KVERSION="${kernel.modDirVersion}" KDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" KCFLAGS="-DCONFIG_LOGIWHEELS_FF -DCONFIG_LEDS_CLASS" + ${builtins.concatStringsSep " " kernelModuleMakeFlags} ) ''; diff --git a/pkgs/os-specific/linux/r8125/default.nix b/pkgs/os-specific/linux/r8125/default.nix index d0041d0d04a5..fd62fdcb4a63 100644 --- a/pkgs/os-specific/linux/r8125/default.nix +++ b/pkgs/os-specific/linux/r8125/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitLab, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation (finalAttrs: { @@ -26,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/Makefile --replace-fail "modules_install" "INSTALL_MOD_PATH=$out modules_install" ''; - makeFlags = [ + makeFlags = kernelModuleMakeFlags ++ [ "BASEDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}" ]; diff --git a/pkgs/os-specific/linux/system76-io/default.nix b/pkgs/os-specific/linux/system76-io/default.nix index 034281346c0d..06c37a1475f2 100644 --- a/pkgs/os-specific/linux/system76-io/default.nix +++ b/pkgs/os-specific/linux/system76-io/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: let version = "1.0.4"; @@ -24,6 +25,8 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernelModuleMakeFlags; + buildFlags = [ "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/system76/default.nix b/pkgs/os-specific/linux/system76/default.nix index fe84cc4df83c..191167473ce7 100644 --- a/pkgs/os-specific/linux/system76/default.nix +++ b/pkgs/os-specific/linux/system76/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: let version = "1.0.17"; @@ -24,6 +25,8 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernelModuleMakeFlags; + buildFlags = [ "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/tt-kmd/default.nix b/pkgs/os-specific/linux/tt-kmd/default.nix index 9de08e1c1824..2bb01c5a836b 100644 --- a/pkgs/os-specific/linux/tt-kmd/default.nix +++ b/pkgs/os-specific/linux/tt-kmd/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation (finalAttrs: { pname = "tt-kmd"; @@ -17,6 +18,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernelModuleMakeFlags; + buildFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/universal-pidff/default.nix b/pkgs/os-specific/linux/universal-pidff/default.nix index 88d1169df2eb..dde28298e15b 100644 --- a/pkgs/os-specific/linux/universal-pidff/default.nix +++ b/pkgs/os-specific/linux/universal-pidff/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = [ + makeFlags = kernelModuleMakeFlags ++ [ "KVERSION=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" diff --git a/pkgs/os-specific/linux/vendor-reset/default.nix b/pkgs/os-specific/linux/vendor-reset/default.nix index 210ffa17f152..bcf1b6e5d6fb 100644 --- a/pkgs/os-specific/linux/vendor-reset/default.nix +++ b/pkgs/os-specific/linux/vendor-reset/default.nix @@ -2,6 +2,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, lib, }: @@ -28,7 +29,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; - makeFlags = [ + makeFlags = kernelModuleMakeFlags ++ [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix index cb89449424c7..b465aec91378 100644 --- a/pkgs/os-specific/linux/xone/default.nix +++ b/pkgs/os-specific/linux/xone/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation (finalAttrs: { pname = "xone"; @@ -21,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = [ + makeFlags = kernelModuleMakeFlags ++ [ "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(sourceRoot)" diff --git a/pkgs/os-specific/linux/xpad-noone/default.nix b/pkgs/os-specific/linux/xpad-noone/default.nix index f96e1148cd73..7851edfc368f 100644 --- a/pkgs/os-specific/linux/xpad-noone/default.nix +++ b/pkgs/os-specific/linux/xpad-noone/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation (finalAttr: { @@ -20,6 +21,8 @@ stdenv.mkDerivation (finalAttr: { nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernelModuleMakeFlags; + postPatch = '' substituteInPlace Makefile --replace-fail "/lib/modules/\$(shell uname -r)/build" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" '';