summary refs log tree commit diff
path: root/pkgs/os-specific/linux/rtl8189es/default.nix
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2022-02-10 13:34:51 +0800
committerNick Cao <nickcao@nichi.co>2022-03-07 12:23:49 +0800
commit364b75a8628050c159a9fb7e207de721489c4452 (patch)
tree822a7f39a6eca070013c4a97a08a0cce99d7ddab /pkgs/os-specific/linux/rtl8189es/default.nix
parent977b3b12ace5cdb7bac6e43a18579d6cb031c2a1 (diff)
downloadnixpkgs-364b75a8628050c159a9fb7e207de721489c4452.tar
nixpkgs-364b75a8628050c159a9fb7e207de721489c4452.tar.gz
nixpkgs-364b75a8628050c159a9fb7e207de721489c4452.tar.bz2
nixpkgs-364b75a8628050c159a9fb7e207de721489c4452.tar.lz
nixpkgs-364b75a8628050c159a9fb7e207de721489c4452.tar.xz
nixpkgs-364b75a8628050c159a9fb7e207de721489c4452.tar.zst
nixpkgs-364b75a8628050c159a9fb7e207de721489c4452.zip
rtl8189es: 2020-10-03 -> 2021-10-01, move moduleBuildDependencies to nativeBuildInputs
Diffstat (limited to 'pkgs/os-specific/linux/rtl8189es/default.nix')
-rw-r--r--pkgs/os-specific/linux/rtl8189es/default.nix14
1 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/rtl8189es/default.nix b/pkgs/os-specific/linux/rtl8189es/default.nix
index 500359f7e4f..d6b5785210b 100644
--- a/pkgs/os-specific/linux/rtl8189es/default.nix
+++ b/pkgs/os-specific/linux/rtl8189es/default.nix
@@ -2,17 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "rtl8189es-${kernel.version}-${version}";
-  version = "2020-10-03";
+  version = "2021-10-01";
 
   src = fetchFromGitHub {
     owner = "jwrdegoede";
     repo = "rtl8189ES_linux";
-    rev = "03ac413135a355b55b693154c44b70f86a39732e";
-    sha256 = "0wiikviwyvy6h55rgdvy7csi1zqniqg26p8x44rd6mhbw0g00h56";
+    rev = "be378f47055da1bae42ff6ec1d62f1a5052ef097";
+    sha256 = "sha256-+19q1Xux2BjquavY+s0UDzTubEt6BEUZ9XVDVmj36us=";
   };
 
-  nativeBuildInputs = [ bc nukeReferences ];
-  buildInputs = kernel.moduleBuildDependencies;
+  nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies;
 
   hardeningDisable = [ "pic" "format" ];
 
@@ -23,13 +22,10 @@ stdenv.mkDerivation rec {
     substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
   '';
 
-  makeFlags = [
-    "ARCH=${stdenv.hostPlatform.linuxArch}"
+  makeFlags = kernel.makeFlags ++ [
     "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     ("CONFIG_PLATFORM_I386_PC=" + (if (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) then "y" else "n"))
     ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n"))
-  ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
-    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
   ];
 
   preInstall = ''