3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #149580 from Sweenu/master

ddcci-driver: 4.1 -> 4.2
This commit is contained in:
Bernardo Meurer 2021-12-09 03:00:11 -08:00 committed by GitHub
commit 1b5128b163
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,18 +1,15 @@
{ lib, stdenv, fetchpatch, fetchFromGitLab, kernel }: { lib, stdenv, fetchFromGitLab, kernel }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ddcci-driver"; pname = "ddcci-driver";
# XXX: We apply a patch for the upcoming version to the source of version 0.4.1
# XXX: When 0.4.2 is actually released, don't forget to remove this comment,
# XXX: fix the rev in fetchFromGitLab, and remove the patch.
version = "0.4.2"; version = "0.4.2";
name = "${pname}-${kernel.version}-${version}"; name = "${pname}-${kernel.version}-${version}";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "${pname}-linux"; owner = "${pname}-linux";
repo = "${pname}-linux"; repo = "${pname}-linux";
rev = "v0.4.1"; rev = "v${version}";
sha256 = "1qhsm0ccwfmwn0r6sbc6ms4lf4a3iqfcgqmbs6afr6hhxkqll3fg"; sha256 = "sSmL8PqxqHHQiume62si/Kc9El58/b4wkB93iG0dnNM=";
}; };
hardeningDisable = [ "pic" ]; hardeningDisable = [ "pic" ];
@ -28,13 +25,6 @@ stdenv.mkDerivation rec {
--replace depmod \# --replace depmod \#
''; '';
patches = [
(fetchpatch {
url = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/commit/bf9d79852cbd0aa5c2e288ce51b8280f74a1f5d2.patch";
sha256 = "sha256-ShqVzkoRnlX4Y5ARY11YVYatFI1K7bAtLulP3/8/nwg=";
})
];
makeFlags = kernel.makeFlags ++ [ makeFlags = kernel.makeFlags ++ [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"KVER=${kernel.modDirVersion}" "KVER=${kernel.modDirVersion}"