summary refs log tree commit diff
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2022-02-10 13:27:42 +0800
committerNick Cao <nickcao@nichi.co>2022-03-07 12:23:49 +0800
commitc0ed14933fdd91c7e8999ecb940a503f13630cdf (patch)
tree5beb9828a70779d22e6615bb30a5d8fa2d696cb2
parenta0f82198c7670619894b8ff21590d725b8b48639 (diff)
downloadnixpkgs-c0ed14933fdd91c7e8999ecb940a503f13630cdf.tar
nixpkgs-c0ed14933fdd91c7e8999ecb940a503f13630cdf.tar.gz
nixpkgs-c0ed14933fdd91c7e8999ecb940a503f13630cdf.tar.bz2
nixpkgs-c0ed14933fdd91c7e8999ecb940a503f13630cdf.tar.lz
nixpkgs-c0ed14933fdd91c7e8999ecb940a503f13630cdf.tar.xz
nixpkgs-c0ed14933fdd91c7e8999ecb940a503f13630cdf.tar.zst
nixpkgs-c0ed14933fdd91c7e8999ecb940a503f13630cdf.zip
r8168: prepend kernel.makeFlags to makeFlags
-rw-r--r--pkgs/os-specific/linux/r8168/default.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix
index 91e15db2eeb..680cc531af4 100644
--- a/pkgs/os-specific/linux/r8168/default.nix
+++ b/pkgs/os-specific/linux/r8168/default.nix
@@ -27,11 +27,13 @@ in stdenv.mkDerivation rec {
   # avoid using the Makefile directly -- it doesn't understand
   # any kernel but the current.
   # based on the ArchLinux pkgbuild: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/r8168
+  makeFlags = kernel.makeFlags ++ [
+    "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    "M=$(PWD)/src"
+    "modules"
+  ];
   preBuild = ''
-    makeFlagsArray+=("-C${kernel.dev}/lib/modules/${kernel.modDirVersion}/build")
-    makeFlagsArray+=("M=$PWD/src")
     makeFlagsArray+=("EXTRA_CFLAGS=-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN -DCONFIG_ASPM -DENABLE_S5WOL -DENABLE_EEE")
-    makeFlagsArray+=("modules")
   '';
 
   enableParallelBuilding = true;