Skip to content

Commit 954600a

Browse files
ccicnce113424JohnRTitor
authored andcommitted
pkgsLLVM.linuxPackages: fix kernel modules building by setting makeFlags
1 parent 9828254 commit 954600a

File tree

17 files changed

+40
-10
lines changed

17 files changed

+40
-10
lines changed

pkgs/os-specific/linux/acer-wmi-battery/default.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
lib,
44
fetchFromGitHub,
55
kernel,
6+
kernelModuleMakeFlags,
67
}:
78

89
let
@@ -20,6 +21,8 @@ stdenv.mkDerivation {
2021
hash = "sha256-mI6Ob9BmNfwqT3nndWf3jkz8f7tV10odkTnfApsNo+A=";
2122
};
2223

24+
makeFlags = kernelModuleMakeFlags;
25+
2326
postPatch = ''
2427
substituteInPlace Makefile \
2528
--replace-fail '/lib/modules/$(shell uname -r)/build' ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build

pkgs/os-specific/linux/ajantv2/default.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
stdenv,
33
kernel,
4+
kernelModuleMakeFlags,
45
libajantv2,
56
}:
67
stdenv.mkDerivation {
@@ -18,6 +19,8 @@ stdenv.mkDerivation {
1819

1920
nativeBuildInputs = kernel.moduleBuildDependencies;
2021

22+
makeFlags = kernelModuleMakeFlags;
23+
2124
preBuild = ''
2225
chmod -R +w ../../
2326
'';

pkgs/os-specific/linux/asus-ec-sensors/default.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
stdenv,
44
fetchFromGitHub,
55
kernel,
6+
kernelModuleMakeFlags,
67
}:
78

89
stdenv.mkDerivation rec {
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
2021

2122
nativeBuildInputs = kernel.moduleBuildDependencies;
2223

23-
makeFlags = [
24+
makeFlags = kernelModuleMakeFlags ++ [
2425
"KERNELRELEASE=${kernel.modDirVersion}"
2526
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}"
2627
];

pkgs/os-specific/linux/facetimehd/default.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
lib,
44
fetchFromGitHub,
55
kernel,
6+
kernelModuleMakeFlags,
67
}:
78

89
stdenv.mkDerivation rec {
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
3435

3536
nativeBuildInputs = kernel.moduleBuildDependencies;
3637

37-
makeFlags = [
38+
makeFlags = kernelModuleMakeFlags ++ [
3839
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
3940
];
4041

pkgs/os-specific/linux/hpuefi-mod/default.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
stdenv,
33
fetchzip,
44
kernel,
5+
kernelModuleMakeFlags,
56
lib,
67
}:
78
stdenv.mkDerivation (finalAttrs: {
@@ -17,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
1718
nativeBuildInputs = kernel.moduleBuildDependencies;
1819
strictDeps = true;
1920

20-
makeFlags = [
21+
makeFlags = kernelModuleMakeFlags ++ [
2122
"KVERS=${kernel.modDirVersion}"
2223
"KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
2324
"DESTDIR=$(out)"

pkgs/os-specific/linux/it87/default.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
stdenv,
44
fetchFromGitHub,
55
kernel,
6+
kernelModuleMakeFlags,
67
}:
78

89
stdenv.mkDerivation rec {
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
2627
sed -i 's|depmod|#depmod|' Makefile
2728
'';
2829

29-
makeFlags = [
30+
makeFlags = kernelModuleMakeFlags ++ [
3031
"TARGET=${kernel.modDirVersion}"
3132
"KERNEL_MODULES=${kernel.dev}/lib/modules/${kernel.modDirVersion}"
3233
"MODDESTDIR=$(out)/lib/modules/${kernel.modDirVersion}/kernel/drivers/hwmon"

pkgs/os-specific/linux/kvmfr/default.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
lib,
33
stdenv,
44
kernel,
5+
kernelModuleMakeFlags,
56
looking-glass-client,
67
}:
78

@@ -17,7 +18,7 @@ stdenv.mkDerivation {
1718
];
1819
nativeBuildInputs = kernel.moduleBuildDependencies;
1920

20-
makeFlags = [
21+
makeFlags = kernelModuleMakeFlags ++ [
2122
"KVER=${kernel.modDirVersion}"
2223
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
2324
];

pkgs/os-specific/linux/liquidtux/default.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
stdenv,
44
fetchFromGitHub,
55
kernel,
6+
kernelModuleMakeFlags,
67
}:
78

89
stdenv.mkDerivation rec {
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
2021

2122
nativeBuildInputs = kernel.moduleBuildDependencies;
2223

23-
makeFlags = [
24+
makeFlags = kernelModuleMakeFlags ++ [
2425
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
2526
];
2627

pkgs/os-specific/linux/new-lg4ff/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
lib,
33
stdenv,
44
kernel,
5+
kernelModuleMakeFlags,
56
fetchFromGitHub,
67
}:
78

@@ -30,6 +31,7 @@ stdenv.mkDerivation rec {
3031
KVERSION="${kernel.modDirVersion}"
3132
KDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
3233
KCFLAGS="-DCONFIG_LOGIWHEELS_FF -DCONFIG_LEDS_CLASS"
34+
${builtins.concatStringsSep " " kernelModuleMakeFlags}
3335
)
3436
'';
3537

pkgs/os-specific/linux/r8125/default.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
lib,
44
fetchFromGitLab,
55
kernel,
6+
kernelModuleMakeFlags,
67
}:
78

89
stdenv.mkDerivation (finalAttrs: {
@@ -26,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
2627
substituteInPlace src/Makefile --replace-fail "modules_install" "INSTALL_MOD_PATH=$out modules_install"
2728
'';
2829

29-
makeFlags = [
30+
makeFlags = kernelModuleMakeFlags ++ [
3031
"BASEDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}"
3132
];
3233

0 commit comments

Comments
 (0)