pyrox.dev
Merge pull request #18073 from joachifm/rtl8723bs
rtl8723bs: 6918e9b2ff29 -> 2016-04-11, fix build against 4.7
+1
-1
pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix
+1
-1
pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix
···
1
1
{ stdenv, linuxPackages }:
2
2
with stdenv.lib;
3
3
stdenv.mkDerivation {
4
-
name = "rtl8723bs-firmware-${linuxPackages.rtl8723bs.rev}";
4
+
name = "rtl8723bs-firmware-${linuxPackages.rtl8723bs.version}";
5
5
inherit (linuxPackages.rtl8723bs) src;
6
6
7
7
phases = [ "unpackPhase" "installPhase" ];
+6
-5
pkgs/os-specific/linux/rtl8723bs/default.nix
+6
-5
pkgs/os-specific/linux/rtl8723bs/default.nix
···
1
1
{ stdenv, fetchFromGitHub, nukeReferences, kernel }:
2
2
with stdenv.lib;
3
3
stdenv.mkDerivation rec {
4
-
name = "rtl8723bs-${kernel.version}-${rev}";
5
-
rev = "6918e9b2ff297b1cc7fde193e72452c33c10e1c8";
4
+
name = "rtl8723bs-${kernel.version}-${version}";
5
+
version = "2016-04-11";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "hadess";
9
9
repo = "rtl8723bs";
10
-
inherit rev;
11
-
sha256 = "07srd457wnz29nvvq02wz66s387bhjbydnmbs3qr7ljprabhsgmi";
10
+
rev = "11ab92d8ccd71c80f0102828366b14ef6b676fb2";
11
+
sha256 = "05q7mf12xcb00v6ba4wwvqi53q7ph5brfkj17xf6vkx4jr7xxnmm";
12
12
};
13
13
14
14
hardeningDisable = [ "pic" ];
···
35
35
homepage = "https://github.com/hadess/rtl8723bs";
36
36
license = stdenv.lib.licenses.gpl2;
37
37
platforms = stdenv.lib.platforms.linux;
38
-
broken = ! versionAtLeast kernel.version "3.19";
38
+
broken = (! versionAtLeast kernel.version "3.19")
39
+
|| (kernel.features.grsecurity or false);
39
40
maintainers = with maintainers; [ elitak ];
40
41
};
41
42
}