From 780b1713010c397bf06ee7d719a4606505d14197 Mon Sep 17 00:00:00 2001
From: Ivar <ivar.scholten@protonmail.com>
Date: Sun, 3 May 2020 20:32:32 +0200
Subject: [PATCH 1/2] xp-pen-g430: rename to pentablet-driver

---
 .../drivers/{xp-pen-g430 => pentablet-driver}/default.nix     | 4 ++--
 pkgs/top-level/aliases.nix                                    | 1 +
 pkgs/top-level/all-packages.nix                               | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename pkgs/misc/drivers/{xp-pen-g430 => pentablet-driver}/default.nix (89%)

diff --git a/pkgs/misc/drivers/xp-pen-g430/default.nix b/pkgs/misc/drivers/pentablet-driver/default.nix
similarity index 89%
rename from pkgs/misc/drivers/xp-pen-g430/default.nix
rename to pkgs/misc/drivers/pentablet-driver/default.nix
index c382239f26a..99c00bf0f2d 100644
--- a/pkgs/misc/drivers/xp-pen-g430/default.nix
+++ b/pkgs/misc/drivers/pentablet-driver/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, wrapQtAppsHook, libglvnd }:
 stdenv.mkDerivation rec {
-  pname = "xp-pen-G430";
+  pname = "pentablet-driver";
   version = "20190820";
 
   src = fetchzip {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = "https://www.xp-pen.com/download-46.html";
-    description = "Driver for the XP-PEN G430 drawing tablet";
+    description = "Driver for XP-PEN Pentablet drawing tablets";
     license = licenses.unfree;
     platforms = platforms.linux;
     maintainers = with maintainers; [ ivar ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 88e7d4d9e84..1b691c4f869 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -535,6 +535,7 @@ mapAliases ({
   winswitch = throw "winswitch has been removed from nixpkgs."; # added 2019-12-10
   wireguard = wireguard-tools; # added 2018-05-19
   morituri = whipper; # added 2018-09-13
+  xp-pen-g430 = pentablet-driver; # added 2020-05-03
   xfceUnstable = xfce4-14; # added 2019-09-17
   xfce4-14 = xfce;
   xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # added 2020-03-14
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf92cae7a6a..abcba8f5ccb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26346,7 +26346,7 @@ in
 
   bcompare = libsForQt5.callPackage ../applications/version-management/bcompare {};
 
-  xp-pen-g430 = libsForQt5.callPackage ../misc/drivers/xp-pen-g430 {};
+  pentablet-driver = libsForQt5.callPackage ../misc/drivers/pentablet-driver { };
 
   qmk_firmware = callPackage ../development/misc/qmk_firmware {
     avrgcc = pkgsCross.avr.buildPackages.gcc;

From daf860d9fe9d10a2f7e3f86037f9472b30626ed1 Mon Sep 17 00:00:00 2001
From: Ivar <ivar.scholten@protonmail.com>
Date: Sun, 3 May 2020 20:34:21 +0200
Subject: [PATCH 2/2] pentablet-driver: 20190820 -> 1.2.13.1

---
 .../misc/drivers/pentablet-driver/default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/misc/drivers/pentablet-driver/default.nix b/pkgs/misc/drivers/pentablet-driver/default.nix
index 99c00bf0f2d..2f46d950d58 100644
--- a/pkgs/misc/drivers/pentablet-driver/default.nix
+++ b/pkgs/misc/drivers/pentablet-driver/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, wrapQtAppsHook, libglvnd }:
-stdenv.mkDerivation rec {
+{ stdenv, mkDerivation, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, libglvnd }:
+
+mkDerivation rec {
   pname = "pentablet-driver";
-  version = "20190820";
+  version = "1.2.13.1";
 
   src = fetchzip {
-    url = "https://download01.xp-pen.com/file/2019/08/Linux%20Beta%20Driver(${version}).zip";
-    sha256 = "091kfqxxj90pdmwncgfl8ldi70pdhwryh3cls30654983m8cgnby";
-  } + /Linux_Pentablet_V1.3.0.0.tar.gz;
+    url = "https://download01.xp-pen.com/file/2020/04/Linux_Pentablet_V${version}.tar.gz(20200428).zip";
+    sha256 = "1r423hcpi26v82pzl59br1zw5vablikclqsy6mcqi0v5p84hfrdd";
+  } + /Linux_Pentablet_V1.2.13.1.tar.gz;
 
   nativeBuildInputs = [
     autoPatchelfHook
-    wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -24,14 +24,15 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/bin
-    cp {Pentablet_Driver,config.xml} "$out"/bin
+    cp Pentablet_Driver $out/bin/pentablet-driver
+    cp config.xml $out/bin/config.xml
   '';
 
   meta = with stdenv.lib; {
     homepage = "https://www.xp-pen.com/download-46.html";
     description = "Driver for XP-PEN Pentablet drawing tablets";
     license = licenses.unfree;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ ivar ];
   };
 }