Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 247458f606d8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 65d3a1857629
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 5, 2020

  1. facetimehd: update src to build with linux >= 5.6 

    also add kraem to maintainers
    @kraem
    kraem committed Apr 5, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    sikmir Nikolay Korotkiy
    GPG key ID: D1DE6D7F693663A5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a5b0581 View commit details

  2. Merge pull request #84387 from kraem/fix/facetimehd-linux-5.6 

    facetimehd: update src to build with linux >= 5.6
    @grahamc
    grahamc authored Apr 5, 2020
    Copy the full SHA
    65d3a18 View commit details
Showing with 8 additions and 3 deletions.
  1. +8 −3 pkgs/os-specific/linux/facetimehd/default.nix
11 changes: 8 additions & 3 deletions pkgs/os-specific/linux/facetimehd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, kernel }:
{ stdenv, lib, fetchFromGitHub, kernel }:

# facetimehd is not supported for kernels older than 3.19";
assert stdenv.lib.versionAtLeast kernel.version "3.19";
@@ -44,9 +44,14 @@ stdenv.mkDerivation rec {
'';

hardeningDisable = [ "pic" ];

nativeBuildInputs = kernel.moduleBuildDependencies;

preBuild = lib.optionalString (stdenv.lib.versionAtLeast kernel.version "5.6")
''
sed -i 's/ioremap_nocache/ioremap_cache/g' fthd_drv.c
'';

makeFlags = [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
@@ -55,7 +60,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/patjak/bcwc_pcie;
description = "Linux driver for the Facetime HD (Broadcom 1570) PCIe webcam";
license = licenses.gpl2;
maintainers = with maintainers; [ womfoo grahamc ];
maintainers = with maintainers; [ womfoo grahamc kraem ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}