diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-05-06 12:34:19 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-06 12:34:19 -0400 |
commit | f46cbbc540e74a8b3c8ef3099df4c2a0b434e55b (patch) | |
tree | 8efffa9772e4b0d5045d1658f8ca5d18ceb7b691 /pkgs | |
parent | d3a972ddb2c991adbaf4330c1cfd89d97b1a0391 (diff) | |
parent | daf860d9fe9d10a2f7e3f86037f9472b30626ed1 (diff) |
Merge pull request #86666 from IvarWithoutBones/pentablet-driver
xp-pen-g430: rename to pentablet-driver & 20190820 -> 1.2.13.1
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/misc/drivers/pentablet-driver/default.nix | 38 | ||||
-rw-r--r-- | pkgs/misc/drivers/xp-pen-g430/default.nix | 37 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 40 insertions, 38 deletions
diff --git a/pkgs/misc/drivers/pentablet-driver/default.nix b/pkgs/misc/drivers/pentablet-driver/default.nix new file mode 100644 index 0000000000000..2f46d950d584b --- /dev/null +++ b/pkgs/misc/drivers/pentablet-driver/default.nix @@ -0,0 +1,38 @@ +{ stdenv, mkDerivation, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, libglvnd }: + +mkDerivation rec { + pname = "pentablet-driver"; + version = "1.2.13.1"; + + src = fetchzip { + 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 + ]; + + buildInputs = [ + libusb1 + libX11 + libXtst + qtbase + libglvnd + stdenv.cc.cc.lib + ]; + + installPhase = '' + mkdir -p $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 = [ "x86_64-linux" ]; + maintainers = with maintainers; [ ivar ]; + }; +} diff --git a/pkgs/misc/drivers/xp-pen-g430/default.nix b/pkgs/misc/drivers/xp-pen-g430/default.nix deleted file mode 100644 index c382239f26a62..0000000000000 --- a/pkgs/misc/drivers/xp-pen-g430/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, wrapQtAppsHook, libglvnd }: -stdenv.mkDerivation rec { - pname = "xp-pen-G430"; - version = "20190820"; - - 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; - - nativeBuildInputs = [ - autoPatchelfHook - wrapQtAppsHook - ]; - - buildInputs = [ - libusb1 - libX11 - libXtst - qtbase - libglvnd - stdenv.cc.cc.lib - ]; - - installPhase = '' - mkdir -p $out/bin - cp {Pentablet_Driver,config.xml} "$out"/bin - ''; - - meta = with stdenv.lib; { - homepage = "https://www.xp-pen.com/download-46.html"; - description = "Driver for the XP-PEN G430 drawing tablet"; - 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 cacaa16a93550..1bcdef164d35a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -606,6 +606,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 a0c885e705a9a..722f3a30f3a45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26401,7 +26401,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; |