summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobert Schütz <nix@dotlambda.de>2023-02-21 17:25:14 -0800
committerRobert Schütz <github@dotlambda.de>2023-02-27 08:31:09 -0800
commitb4c4419b05700f5a0af8a9d603f293404d75854e (patch)
treee90328c3a8c9b45aeadbd2d93c36bb59a92d37f5
parent554419c6342fc860eeebe67d3b0ad830955ad65f (diff)
downloadnixpkgs-b4c4419b05700f5a0af8a9d603f293404d75854e.tar
nixpkgs-b4c4419b05700f5a0af8a9d603f293404d75854e.tar.gz
nixpkgs-b4c4419b05700f5a0af8a9d603f293404d75854e.tar.bz2
nixpkgs-b4c4419b05700f5a0af8a9d603f293404d75854e.tar.lz
nixpkgs-b4c4419b05700f5a0af8a9d603f293404d75854e.tar.xz
nixpkgs-b4c4419b05700f5a0af8a9d603f293404d75854e.tar.zst
nixpkgs-b4c4419b05700f5a0af8a9d603f293404d75854e.zip
libwacom-surface: init at 2.4.0
-rw-r--r--pkgs/development/libraries/libwacom/surface.nix37
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 39 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libwacom/surface.nix b/pkgs/development/libraries/libwacom/surface.nix
new file mode 100644
index 00000000000..6168686cf50
--- /dev/null
+++ b/pkgs/development/libraries/libwacom/surface.nix
@@ -0,0 +1,37 @@
+{ lib
+, fetchFromGitHub
+, libwacom
+}:
+
+let
+  libwacom-surface = fetchFromGitHub {
+    owner = "linux-surface";
+    repo = "libwacom-surface";
+    rev = "v2.6.0-1";
+    hash = "sha256-4UOO9LMyCJd4LkqU0uva/0Xc44fIVdIQi27tJOtNEFk=";
+  };
+in libwacom.overrideAttrs (old: {
+  pname = "libwacom-surface";
+
+  # These patches will not be included upstream:
+  # https://github.com/linux-surface/libwacom/issues/2
+  patches = old.patches or [ ] ++ map (p: "${libwacom-surface}/patches/v2/${p}") [
+    "0001-Add-support-for-BUS_VIRTUAL.patch"
+    "0002-Add-support-for-Intel-Management-Engine-bus.patch"
+    "0003-data-Add-Microsoft-Surface-Pro-3.patch"
+    "0004-data-Add-Microsoft-Surface-Pro-4.patch"
+    "0005-data-Add-Microsoft-Surface-Pro-5.patch"
+    "0006-data-Add-Microsoft-Surface-Pro-6.patch"
+    "0007-data-Add-Microsoft-Surface-Pro-7.patch"
+    "0008-data-Add-Microsoft-Surface-Book.patch"
+    "0009-data-Add-Microsoft-Surface-Book-2-13.5.patch"
+    "0010-data-Add-Microsoft-Surface-Book-2-15.patch"
+    "0011-data-Add-Microsoft-Surface-Book-3-13.5.patch"
+    "0012-data-Add-Microsoft-Surface-Book-3-15.patch"
+  ];
+
+  meta = old.meta // {
+    homepage = "https://github.com/linux-surface/libwacom-surface";
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4e5b5b9176..150f50889ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22125,6 +22125,8 @@ with pkgs;
 
   libwacom = callPackage ../development/libraries/libwacom { };
 
+  libwacom-surface = callPackage ../development/libraries/libwacom/surface.nix { };
+
   lightning = callPackage ../development/libraries/lightning { };
 
   lightlocker = callPackage ../misc/screensavers/light-locker { };