xppen_{3,4}: deduplicate common code

NixOS · Nov 7, 2024 · a8c8e13 · a8c8e13
1 parent 1bcff45
commit a8c8e13
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 72 deletions.
diff --git a/pkgs/applications/misc/xppen/default.nix b/pkgs/applications/misc/xppen/default.nix
@@ -0,0 +1,18 @@
+{
+  callPackage,
+}:
+
+{
+  xppen_3 = callPackage ./generic.nix {
+    pname = "xppen_3";
+    version = "3.4.9-240131";
+    url = "https://www.xp-pen.com/download/file.html?id=2829&pid=1016&ext=gz";
+    hash = "sha256-udUjkOW6nGo8zvMhVl6Iepa6OzCVz/M9m+DMqNKrfFg=";
+  };
+  xppen_4 = callPackage ./generic.nix {
+    pname = "xppen_4";
+    version = "4.0.4-240815";
+    url = "https://www.xp-pen.com/download/file.html?id=3325&pid=1016&ext=gz";
+    hash = "sha256-NVO9VaUmcQDI4rL76BBQDmII8vpmmo9qgcGetv6CIFE=";
+  };
+}
diff --git a/pkgs/by-name/xp/xppen_3/package.nix → pkgs/applications/misc/xppen/generic.nix b/pkgs/by-name/xp/xppen_3/package.nix → pkgs/applications/misc/xppen/generic.nix
@@ -5,17 +5,18 @@
   autoPatchelfHook,
   qt5,
   libusb1,
+  pname,
+  version,
+  url,
+  hash,
 }:
 
 stdenv.mkDerivation {
-  pname = "xppen_3";
-  version = "3.4.9-240131";
+  inherit pname version;
 
-  # to update: try to find the latest 3.x.x .tar.gz on https://www.xp-pen.com/download
   src = fetchzip {
     extension = "tar.gz";
-    url = "https://www.xp-pen.com/download/file.html?id=2829&pid=1016&ext=gz";
-    hash = "sha256-udUjkOW6nGo8zvMhVl6Iepa6OzCVz/M9m+DMqNKrfFg=";
+    inherit url hash;
   };
 
   nativeBuildInputs = [

diff --git a/pkgs/by-name/xp/xppen_4/package.nix b/pkgs/by-name/xp/xppen_4/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -33708,6 +33708,9 @@ with pkgs;
 
   xpano = callPackage ../applications/graphics/xpano { };
 
+  inherit (callPackage ../applications/misc/xppen { })
+    xppen_3 xppen_4;
+
   xv = callPackage ../applications/graphics/xv { };
 
   xygrib = libsForQt5.callPackage ../applications/misc/xygrib { };