public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18073 from joachifm/rtl8723bs

Browse Source 
rtl8723bs: 6918e9b2ff29 -> 2016-04-11, fix build against 4.7
This commit is contained in:
Joachim F 2016-09-01 14:48:51 +02:00 committed by GitHub
commit 8c90b7db89
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, linuxPackages }: { stdenv, linuxPackages }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "rtl8723bs-firmware-${linuxPackages.rtl8723bs.rev}"; name = "rtl8723bs-firmware-${linuxPackages.rtl8723bs.version}";
inherit (linuxPackages.rtl8723bs) src; inherit (linuxPackages.rtl8723bs) src;
phases = [ "unpackPhase" "installPhase" ]; phases = [ "unpackPhase" "installPhase" ];

11
pkgs/os-specific/linux/rtl8723bs/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, nukeReferences, kernel }: { stdenv, fetchFromGitHub, nukeReferences, kernel }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rtl8723bs-${kernel.version}-${rev}"; name = "rtl8723bs-${kernel.version}-${version}";
rev = "6918e9b2ff297b1cc7fde193e72452c33c10e1c8"; version = "2016-04-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hadess"; owner = "hadess";
repo = "rtl8723bs"; repo = "rtl8723bs";
inherit rev; rev = "11ab92d8ccd71c80f0102828366b14ef6b676fb2";
sha256 = "07srd457wnz29nvvq02wz66s387bhjbydnmbs3qr7ljprabhsgmi"; sha256 = "05q7mf12xcb00v6ba4wwvqi53q7ph5brfkj17xf6vkx4jr7xxnmm";
}; };
hardeningDisable = [ "pic" ]; hardeningDisable = [ "pic" ];
@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/hadess/rtl8723bs"; homepage = "https://github.com/hadess/rtl8723bs";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
broken = ! versionAtLeast kernel.version "3.19"; broken = (! versionAtLeast kernel.version "3.19")
|| (kernel.features.grsecurity or false);
maintainers = with maintainers; [ elitak ]; maintainers = with maintainers; [ elitak ];
}; };
} }