diff options
author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2016-04-28 00:04:44 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2016-04-28 00:04:44 +0300 |
commit | 49d1acb50f6465aceb5502de62e0c5d3a3d1d1a4 (patch) | |
tree | a37563205421bdc27d1499dd7477351cb25b5116 | |
parent | 9d91c034872f1c9d019b9221285f06ae53d5fe9d (diff) | |
parent | 62551b53185d8c90e58bade93be0fe9d23ad5060 (diff) | |
download | nixlib-49d1acb50f6465aceb5502de62e0c5d3a3d1d1a4.tar nixlib-49d1acb50f6465aceb5502de62e0c5d3a3d1d1a4.tar.gz nixlib-49d1acb50f6465aceb5502de62e0c5d3a3d1d1a4.tar.bz2 nixlib-49d1acb50f6465aceb5502de62e0c5d3a3d1d1a4.tar.lz nixlib-49d1acb50f6465aceb5502de62e0c5d3a3d1d1a4.tar.xz nixlib-49d1acb50f6465aceb5502de62e0c5d3a3d1d1a4.tar.zst nixlib-49d1acb50f6465aceb5502de62e0c5d3a3d1d1a4.zip |
Merge pull request #14896 from elitak/rtl8723bs
rtl8723bs: improved build and split off firmware
-rw-r--r-- | nixos/modules/hardware/all-firmware.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix | 21 | ||||
-rw-r--r-- | pkgs/os-specific/linux/rtl8723bs/default.nix | 51 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 55 insertions, 25 deletions
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index d0d481f72a40..fb8e1ccab667 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -22,7 +22,11 @@ with lib; ###### implementation config = mkIf config.hardware.enableAllFirmware { - hardware.firmware = [ pkgs.firmwareLinuxNonfree pkgs.intel2200BGFirmware ]; + hardware.firmware = with pkgs; [ + firmwareLinuxNonfree + intel2200BGFirmware + rtl8723bs-firmware + ]; }; } diff --git a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix new file mode 100644 index 000000000000..dd30003aa408 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix @@ -0,0 +1,21 @@ +{ stdenv, linuxPackages }: +with stdenv.lib; +stdenv.mkDerivation { + name = "rtl8723bs-firmware-${linuxPackages.rtl8723bs.rev}"; + inherit (linuxPackages.rtl8723bs) src; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p "$out/lib/firmware/rtlwifi" + cp rtl8723bs_nic.bin "$out/lib/firmware/rtlwifi" + cp rtl8723bs_wowlan.bin "$out/lib/firmware/rtlwifi" + ''; + + meta = with stdenv.lib; { + description = "Firmware for RealTek 8723bs"; + homepage = https://github.com/hadess/rtl8723bs; + license = licenses.unfreeRedistributableFirmware; + maintainers = with maintainers; [ elitak ]; + }; +} diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix index 6d55c5522f44..e8cc1f40067e 100644 --- a/pkgs/os-specific/linux/rtl8723bs/default.nix +++ b/pkgs/os-specific/linux/rtl8723bs/default.nix @@ -1,36 +1,39 @@ -{ stdenv, fetchFromGitHub, kernel }: - -let - ver = "c517f2b"; -in +{ stdenv, fetchFromGitHub, nukeReferences, kernel }: +with stdenv.lib; stdenv.mkDerivation rec { - name = "rtl8723bs-${kernel.version}-c517f2b"; - + name = "rtl8723bs-${kernel.version}-${rev}"; + rev = "6918e9b2ff297b1cc7fde193e72452c33c10e1c8"; + src = fetchFromGitHub { owner = "hadess"; repo = "rtl8723bs"; - rev = "c517f2bf8bcc3d57311252ea7cd49ae81466eead"; - sha256 = "0phzrhq85g52pi2b74a9sr9l2x6dzlz714k3pix486w2x5axw4xb"; + inherit rev; + sha256 = "07srd457wnz29nvvq02wz66s387bhjbydnmbs3qr7ljprabhsgmi"; }; - - patchPhase = '' - 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/firmware' "$out/lib/firmware" - ''; - - preInstall = '' - mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" - mkdir -p "$out/lib/firmware/rtlwifi" + + buildInputs = [ nukeReferences ]; + + makeFlags = concatStringsSep " " [ + "ARCH=${stdenv.platform.kernelArch}" # Normally not needed, but the Makefile sets ARCH in a broken way. + "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" # Makefile uses $(uname -r); breaks us. + ]; + + enableParallelBuilding = true; + + # The Makefile doesn't use env-vars well, so install manually: + installPhase = '' + mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless + cp r8723bs.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless + + nuke-refs $(find $out -name "*.ko") ''; - + meta = { description = "Realtek SDIO Wi-Fi driver"; homepage = "https://github.com/hadess/rtl8723bs"; license = stdenv.lib.licenses.gpl2; - platforms = [ "x86_64-linux" "i686-linux" ]; - broken = !stdenv.lib.versionAtLeast kernel.version "3.19"; + platforms = [ "x86_64-linux" "i686-linux" "armv7l-linux" ]; + broken = ! versionAtLeast kernel.version "3.19"; + maintainers = with maintainers; [ elitak ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2df504e2f1f7..6956841b0ca9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11021,6 +11021,8 @@ in rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { }; + rtl8723bs-firmware = callPackage ../os-specific/linux/firmware/rtl8723bs-firmware { }; + s3ql = callPackage ../tools/backup/s3ql { }; sassc = callPackage ../development/tools/sassc { }; |