From 24c3b7cc4eae423e16b26935688fd733a6fe33e9 Mon Sep 17 00:00:00 2001 From: plchldr Date: Sun, 25 Nov 2018 09:30:03 +0100 Subject: [PATCH 1/2] add myself to maintainers --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 87c144f0d42..f93aca68aaa 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3404,6 +3404,11 @@ github = "pkmx"; name = "Chih-Mao Chen"; }; + plchldr = { + email = "mail@oddco.de"; + github = "plchldr"; + name = "Jonas Beyer"; + }; plcplc = { email = "plcplc@gmail.com"; github = "plcplc"; From 0972bde7d22f10838485682cfc00ad4ef95e8d09 Mon Sep 17 00:00:00 2001 From: plchldr Date: Sun, 25 Nov 2018 09:49:01 +0100 Subject: [PATCH 2/2] rtl8821a: init at 5.1.5 --- pkgs/os-specific/linux/rtl8821au/default.nix | 40 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/os-specific/linux/rtl8821au/default.nix diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix new file mode 100644 index 00000000000..9cb28d5dc8d --- /dev/null +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, kernel, bc }: + +stdenv.mkDerivation rec { + name = "rtl8821au-${kernel.version}-${version}"; + version = "5.1.5"; + + src = fetchFromGitHub { + owner = "zebulon2"; + repo = "rtl8812au"; + rev = "61d0cd95afc01eae64da0c446515803910de1a00"; + sha256 = "0dlzyiaa3hmb2qj3lik52px88n4mgrx7nblbm4s0hn36g19ylssw"; + }; + + nativeBuildInputs = [ bc ]; + buildInputs = kernel.moduleBuildDependencies; + + hardeningDisable = [ "pic" "format" ]; + + NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; + + prePatch = '' + substituteInPlace ./Makefile \ + --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ + --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ + --replace /sbin/depmod \# \ + --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + preInstall = '' + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + meta = with stdenv.lib; { + description = "rtl8821AU, rtl8812AU and rtl8811AU chipset driver with firmware"; + homepage = https://github.com/zebulon2/rtl8812au; + license = licenses.gpl2; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = with maintainers; [ plchldr ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3773df2c94f..4b1bc4254fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14481,6 +14481,8 @@ with pkgs; rtl8814au = callPackage ../os-specific/linux/rtl8814au { }; + rtl8821au = callPackage ../os-specific/linux/rtl8821au { }; + rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { }; openafs = callPackage ../servers/openafs/1.6/module.nix { };