Merge pull request #19578 from grahamc/facetimehd

facetimehd: 2016-05-02 -> 2016-10-09
This commit is contained in:
Graham Christensen 2016-10-17 17:11:18 -04:00 committed by GitHub
commit 3bd1e62a6d

View File

@ -3,25 +3,40 @@
# facetimehd is not supported for kernels older than 3.19";
assert stdenv.lib.versionAtLeast kernel.version "3.19";
let
# Note: When updating this revision:
# 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/
# 2. Test the module and firmware change via:
# a. Give some applications a try (Skype, Hangouts, Cheese, etc.)
# b. Run: journalctl -f
# c. Then close the lid
# d. Then open the lid (and maybe press a key to wake it up)
# e. see if the module loads back (apps using the camera won't
# recover and will have to be restarted) and the camera
# still works.
srcParams = if (stdenv.lib.versionAtLeast kernel.version "4.8") then
{ # Use mainline branch
version = "unstable-2016-10-09";
rev = "887d0f531ef7b91457be519474136c3355c5132b";
sha256 = "0bayahnxar1q6wvf9cb6p8gsfw98w0wqp715hs4r7apmddwk9v7n";
}
else
{ # Use master branch (broken on 4.8)
version = "unstable-2016-05-02";
rev = "5a7083bd98b38ef3bd223f7ee531d58f4fb0fe7c";
sha256 = "0d455kajvn5xav9iilqy7s1qvsy4yb8vzjjxx7bvcgp7aj9ljvdp";
}
;
in
stdenv.mkDerivation rec {
name = "facetimehd-${version}-${kernel.version}";
version = "git-20160503";
version = srcParams.version;
src = fetchFromGitHub {
owner = "patjak";
repo = "bcwc_pcie";
# Note: When updating this revision:
# 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/
# 2. Test the module and firmware change via:
# a. Give some applications a try (Skype, Hangouts, Cheese, etc.)
# b. Run: journalctl -f
# c. Then close the lid
# d. Then open the lid (and maybe press a key to wake it up)
# e. see if the module loads back (apps using the camera won't
# recover and will have to be restarted) and the camera
# still works.
rev = "5a7083bd98b38ef3bd223f7ee531d58f4fb0fe7c";
sha256 = "0d455kajvn5xav9iilqy7s1qvsy4yb8vzjjxx7bvcgp7aj9ljvdp";
inherit (srcParams) rev sha256;
};
preConfigure = ''