Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

pkgsLLVM.linuxPackages: fix kernel modules building by setting makeFlags

authored by ccicnce113424 and committed by Masum Reza 954600a7 9828254b

+40 -10
+3
pkgs/os-specific/linux/acer-wmi-battery/default.nix
··· 3 3 lib, 4 4 fetchFromGitHub, 5 5 kernel, 6 + kernelModuleMakeFlags, 6 7 }: 7 8 8 9 let ··· 19 20 rev = "0889d3ea54655eaa88de552b334911ce7375952f"; 20 21 hash = "sha256-mI6Ob9BmNfwqT3nndWf3jkz8f7tV10odkTnfApsNo+A="; 21 22 }; 23 + 24 + makeFlags = kernelModuleMakeFlags; 22 25 23 26 postPatch = '' 24 27 substituteInPlace Makefile \
+3
pkgs/os-specific/linux/ajantv2/default.nix
··· 1 1 { 2 2 stdenv, 3 3 kernel, 4 + kernelModuleMakeFlags, 4 5 libajantv2, 5 6 }: 6 7 stdenv.mkDerivation { ··· 17 18 hardeningDisable = [ "pic" ]; 18 19 19 20 nativeBuildInputs = kernel.moduleBuildDependencies; 21 + 22 + makeFlags = kernelModuleMakeFlags; 20 23 21 24 preBuild = '' 22 25 chmod -R +w ../../
+2 -1
pkgs/os-specific/linux/asus-ec-sensors/default.nix
··· 3 3 stdenv, 4 4 fetchFromGitHub, 5 5 kernel, 6 + kernelModuleMakeFlags, 6 7 }: 7 8 8 9 stdenv.mkDerivation rec { ··· 20 21 21 22 nativeBuildInputs = kernel.moduleBuildDependencies; 22 23 23 - makeFlags = [ 24 + makeFlags = kernelModuleMakeFlags ++ [ 24 25 "KERNELRELEASE=${kernel.modDirVersion}" 25 26 "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}" 26 27 ];
+2 -1
pkgs/os-specific/linux/facetimehd/default.nix
··· 3 3 lib, 4 4 fetchFromGitHub, 5 5 kernel, 6 + kernelModuleMakeFlags, 6 7 }: 7 8 8 9 stdenv.mkDerivation rec { ··· 34 35 35 36 nativeBuildInputs = kernel.moduleBuildDependencies; 36 37 37 - makeFlags = [ 38 + makeFlags = kernelModuleMakeFlags ++ [ 38 39 "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" 39 40 ]; 40 41
+2 -1
pkgs/os-specific/linux/hpuefi-mod/default.nix
··· 2 2 stdenv, 3 3 fetchzip, 4 4 kernel, 5 + kernelModuleMakeFlags, 5 6 lib, 6 7 }: 7 8 stdenv.mkDerivation (finalAttrs: { ··· 17 18 nativeBuildInputs = kernel.moduleBuildDependencies; 18 19 strictDeps = true; 19 20 20 - makeFlags = [ 21 + makeFlags = kernelModuleMakeFlags ++ [ 21 22 "KVERS=${kernel.modDirVersion}" 22 23 "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" 23 24 "DESTDIR=$(out)"
+2 -1
pkgs/os-specific/linux/it87/default.nix
··· 3 3 stdenv, 4 4 fetchFromGitHub, 5 5 kernel, 6 + kernelModuleMakeFlags, 6 7 }: 7 8 8 9 stdenv.mkDerivation rec { ··· 26 27 sed -i 's|depmod|#depmod|' Makefile 27 28 ''; 28 29 29 - makeFlags = [ 30 + makeFlags = kernelModuleMakeFlags ++ [ 30 31 "TARGET=${kernel.modDirVersion}" 31 32 "KERNEL_MODULES=${kernel.dev}/lib/modules/${kernel.modDirVersion}" 32 33 "MODDESTDIR=$(out)/lib/modules/${kernel.modDirVersion}/kernel/drivers/hwmon"
+2 -1
pkgs/os-specific/linux/kvmfr/default.nix
··· 2 2 lib, 3 3 stdenv, 4 4 kernel, 5 + kernelModuleMakeFlags, 5 6 looking-glass-client, 6 7 }: 7 8 ··· 17 18 ]; 18 19 nativeBuildInputs = kernel.moduleBuildDependencies; 19 20 20 - makeFlags = [ 21 + makeFlags = kernelModuleMakeFlags ++ [ 21 22 "KVER=${kernel.modDirVersion}" 22 23 "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" 23 24 ];
+2 -1
pkgs/os-specific/linux/liquidtux/default.nix
··· 3 3 stdenv, 4 4 fetchFromGitHub, 5 5 kernel, 6 + kernelModuleMakeFlags, 6 7 }: 7 8 8 9 stdenv.mkDerivation rec { ··· 20 21 21 22 nativeBuildInputs = kernel.moduleBuildDependencies; 22 23 23 - makeFlags = [ 24 + makeFlags = kernelModuleMakeFlags ++ [ 24 25 "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" 25 26 ]; 26 27
+2
pkgs/os-specific/linux/new-lg4ff/default.nix
··· 2 2 lib, 3 3 stdenv, 4 4 kernel, 5 + kernelModuleMakeFlags, 5 6 fetchFromGitHub, 6 7 }: 7 8 ··· 30 31 KVERSION="${kernel.modDirVersion}" 31 32 KDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" 32 33 KCFLAGS="-DCONFIG_LOGIWHEELS_FF -DCONFIG_LEDS_CLASS" 34 + ${builtins.concatStringsSep " " kernelModuleMakeFlags} 33 35 ) 34 36 ''; 35 37
+2 -1
pkgs/os-specific/linux/r8125/default.nix
··· 3 3 lib, 4 4 fetchFromGitLab, 5 5 kernel, 6 + kernelModuleMakeFlags, 6 7 }: 7 8 8 9 stdenv.mkDerivation (finalAttrs: { ··· 26 27 substituteInPlace src/Makefile --replace-fail "modules_install" "INSTALL_MOD_PATH=$out modules_install" 27 28 ''; 28 29 29 - makeFlags = [ 30 + makeFlags = kernelModuleMakeFlags ++ [ 30 31 "BASEDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}" 31 32 ]; 32 33
+3
pkgs/os-specific/linux/system76-io/default.nix
··· 3 3 stdenv, 4 4 fetchFromGitHub, 5 5 kernel, 6 + kernelModuleMakeFlags, 6 7 }: 7 8 let 8 9 version = "1.0.4"; ··· 23 24 hardeningDisable = [ "pic" ]; 24 25 25 26 nativeBuildInputs = kernel.moduleBuildDependencies; 27 + 28 + makeFlags = kernelModuleMakeFlags; 26 29 27 30 buildFlags = [ 28 31 "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+3
pkgs/os-specific/linux/system76/default.nix
··· 3 3 stdenv, 4 4 fetchFromGitHub, 5 5 kernel, 6 + kernelModuleMakeFlags, 6 7 }: 7 8 let 8 9 version = "1.0.17"; ··· 23 24 hardeningDisable = [ "pic" ]; 24 25 25 26 nativeBuildInputs = kernel.moduleBuildDependencies; 27 + 28 + makeFlags = kernelModuleMakeFlags; 26 29 27 30 buildFlags = [ 28 31 "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+3
pkgs/os-specific/linux/tt-kmd/default.nix
··· 3 3 stdenv, 4 4 fetchFromGitHub, 5 5 kernel, 6 + kernelModuleMakeFlags, 6 7 }: 7 8 stdenv.mkDerivation (finalAttrs: { 8 9 pname = "tt-kmd"; ··· 16 17 }; 17 18 18 19 nativeBuildInputs = kernel.moduleBuildDependencies; 20 + 21 + makeFlags = kernelModuleMakeFlags; 19 22 20 23 buildFlags = [ 21 24 "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+2 -1
pkgs/os-specific/linux/universal-pidff/default.nix
··· 3 3 lib, 4 4 fetchFromGitHub, 5 5 kernel, 6 + kernelModuleMakeFlags, 6 7 }: 7 8 8 9 stdenv.mkDerivation rec { ··· 26 27 ]; 27 28 nativeBuildInputs = kernel.moduleBuildDependencies; 28 29 29 - makeFlags = [ 30 + makeFlags = kernelModuleMakeFlags ++ [ 30 31 "KVERSION=${kernel.modDirVersion}" 31 32 "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" 32 33 "INSTALL_MOD_PATH=$(out)"
+2 -1
pkgs/os-specific/linux/vendor-reset/default.nix
··· 2 2 stdenv, 3 3 fetchFromGitHub, 4 4 kernel, 5 + kernelModuleMakeFlags, 5 6 lib, 6 7 }: 7 8 ··· 28 29 29 30 hardeningDisable = [ "pic" ]; 30 31 31 - makeFlags = [ 32 + makeFlags = kernelModuleMakeFlags ++ [ 32 33 "KVER=${kernel.modDirVersion}" 33 34 "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" 34 35 ];
+2 -1
pkgs/os-specific/linux/xone/default.nix
··· 3 3 lib, 4 4 fetchFromGitHub, 5 5 kernel, 6 + kernelModuleMakeFlags, 6 7 }: 7 8 stdenv.mkDerivation (finalAttrs: { 8 9 pname = "xone"; ··· 21 22 22 23 nativeBuildInputs = kernel.moduleBuildDependencies; 23 24 24 - makeFlags = [ 25 + makeFlags = kernelModuleMakeFlags ++ [ 25 26 "-C" 26 27 "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" 27 28 "M=$(sourceRoot)"
+3
pkgs/os-specific/linux/xpad-noone/default.nix
··· 3 3 stdenv, 4 4 fetchFromGitHub, 5 5 kernel, 6 + kernelModuleMakeFlags, 6 7 }: 7 8 8 9 stdenv.mkDerivation (finalAttr: { ··· 19 20 hardeningDisable = [ "pic" ]; 20 21 21 22 nativeBuildInputs = kernel.moduleBuildDependencies; 23 + 24 + makeFlags = kernelModuleMakeFlags; 22 25 23 26 postPatch = '' 24 27 substituteInPlace Makefile --replace-fail "/lib/modules/\$(shell uname -r)/build" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"