summary refs log tree commit diff
path: root/pkgs/os-specific/linux/evdi
diff options
context:
space:
mode:
authorfortuneteller2k <lythe1107@gmail.com>2021-06-30 23:55:32 +0800
committerfortuneteller2k <lythe1107@gmail.com>2021-07-06 10:51:18 +0800
commit60b1a047b724e6e9bf4bd43a694b6687b5d8d603 (patch)
treea255f4e03342ce0693c21a21c76c0f35da4afab9 /pkgs/os-specific/linux/evdi
parentbae6796f625bcd1d21db7fc7c2ba6068b2a9bfa4 (diff)
downloadnixpkgs-60b1a047b724e6e9bf4bd43a694b6687b5d8d603.tar
nixpkgs-60b1a047b724e6e9bf4bd43a694b6687b5d8d603.tar.gz
nixpkgs-60b1a047b724e6e9bf4bd43a694b6687b5d8d603.tar.bz2
nixpkgs-60b1a047b724e6e9bf4bd43a694b6687b5d8d603.tar.lz
nixpkgs-60b1a047b724e6e9bf4bd43a694b6687b5d8d603.tar.xz
nixpkgs-60b1a047b724e6e9bf4bd43a694b6687b5d8d603.tar.zst
nixpkgs-60b1a047b724e6e9bf4bd43a694b6687b5d8d603.zip
linuxPackages.evdi: 2021-04-01 -> 2021-06-11, fix 5.13 build
Diffstat (limited to 'pkgs/os-specific/linux/evdi')
-rw-r--r--pkgs/os-specific/linux/evdi/default.nix23
1 files changed, 18 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index a8a0445e955..5eb31e9422d 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -2,15 +2,28 @@
 
 stdenv.mkDerivation rec {
   pname = "evdi";
-  version = "unstable-20210401";
+  version = "unstable-2021-06-11";
 
   src = fetchFromGitHub {
     owner = "DisplayLink";
     repo = pname;
-    rev = "b0b3d131b26df62664ca33775679eea7b70c47b1";
-    sha256 = "09apbvdc78bbqzja9z3b1wrwmqkv3k7cn3lll5gsskxjnqbhxk9y";
+    rev = "65e12fca334f2f42396f4e8d16592d53cab34dd6";
+    sha256 = "sha256-81IfdYKadKT7vRdkmxzfGo4KHa4UJ8uJ0K6djQCr22U=";
   };
 
+  # Linux 5.13 support
+  # The patches break compilation for older kernels
+  patches = lib.optional (kernel.kernelAtLeast "5.13") [
+    (fetchpatch {
+      url = "https://github.com/DisplayLink/evdi/commit/c5f5441d0a115d2cfc8125b8bafaa05b2edc7938.patch";
+      sha256 = "sha256-tWYgBrRh3mXPebhUygOvJ07V87g9JU66hREriACfEVI=";
+    })
+    (fetchpatch {
+      url = "https://github.com/DisplayLink/evdi/commit/5f04d2e2df4cfd21dc15d31f1152c6a66fa48a78.patch";
+      sha256 = "sha256-690/eUiEVWvnT/YAVgKcLo86dgolF9giWRuPxXpL+eQ=";
+    })
+  ];
+
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
   buildInputs = [ kernel libdrm ];
@@ -31,8 +44,8 @@ stdenv.mkDerivation rec {
     description = "Extensible Virtual Display Interface";
     maintainers = with maintainers; [ eyjhb ];
     platforms = platforms.linux;
-    license = with licenses; [ lgpl21 gpl2 ];
+    license = with licenses; [ lgpl21Only gpl2Only ];
     homepage = "https://www.displaylink.com/";
-    broken = versionOlder kernel.version "4.19" || stdenv.isAarch64;
+    broken = kernel.kernelOlder "4.19" || stdenv.isAarch64;
   };
 }