From 0ab8bf61affb83ebe1a32e4b0854c59b8f0e70bc Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 24 Feb 2018 14:00:34 +0100
Subject: [PATCH 1/2] rtl8814au: init at 4.3.21
---
pkgs/os-specific/linux/rtl8814au/default.nix | 38 ++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 40 insertions(+)
create mode 100644 pkgs/os-specific/linux/rtl8814au/default.nix
diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix
new file mode 100644
index 00000000000..b4da1da3d90
--- /dev/null
+++ b/pkgs/os-specific/linux/rtl8814au/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, fetchpatch, kernel }:
+
+stdenv.mkDerivation rec {
+ name = "rtl8814au-${kernel.version}-${version}";
+ version = "4.3.21";
+
+ src = fetchFromGitHub {
+ owner = "zebulon2";
+ repo = "rtl8814au";
+ rev = "a58c56a5a6cb99ffb872f07cb67b68197911854f";
+ sha256 = "1ffm67da183nz009gm5v9w1bab081hrm113kk8knl9s5qbqnn13q";
+ };
+
+ buildInputs = kernel.moduleBuildDependencies;
+
+ hardeningDisable = [ "pic" ];
+
+ NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types";
+
+ prePatch = ''
+ substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/"
+ substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}"
+ substituteInPlace ./Makefile --replace /sbin/depmod \#
+ substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
+ '';
+
+ preInstall = ''
+ mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
+ '';
+
+ meta = {
+ description = "Realtek 8814AU USB WiFi driver";
+ homepage = https://github.com/zebulon2/rtl8814au;
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = [ stdenv.lib.maintainers.lassulus ];
+ platforms = [ "x86_64-linux" "i686-linux" ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8b4e46ceb3..cb7e4073ce6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13257,6 +13257,8 @@ with pkgs;
rtl8812au = callPackage ../os-specific/linux/rtl8812au { };
+ rtl8814au = callPackage ../os-specific/linux/rtl8814au { };
+
rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { };
openafs = callPackage ../servers/openafs/module.nix { };
From e115dac5fcf968720d4a57e4defffc161a71d6cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 24 Feb 2018 14:00:00 +0000
Subject: [PATCH 2/2] rtl8814au: nitpicks
---
pkgs/os-specific/linux/rtl8814au/default.nix | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix
index b4da1da3d90..99b42fc7400 100644
--- a/pkgs/os-specific/linux/rtl8814au/default.nix
+++ b/pkgs/os-specific/linux/rtl8814au/default.nix
@@ -18,21 +18,22 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types";
prePatch = ''
- substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/"
- substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}"
- substituteInPlace ./Makefile --replace /sbin/depmod \#
- substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
+ 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 = {
+ meta = with stdenv.lib; {
description = "Realtek 8814AU USB WiFi driver";
homepage = https://github.com/zebulon2/rtl8814au;
- license = stdenv.lib.licenses.gpl2;
- maintainers = [ stdenv.lib.maintainers.lassulus ];
+ license = licenses.gpl2;
+ maintainers = [ maintainers.lassulus ];
platforms = [ "x86_64-linux" "i686-linux" ];
};
}