diff --git a/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix b/pkgs/by-name/xp/xp-pen-g430-driver/package.nix similarity index 59% rename from pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix rename to pkgs/by-name/xp/xp-pen-g430-driver/package.nix index f316217cf347..525630a6153c 100644 --- a/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix +++ b/pkgs/by-name/xp/xp-pen-g430-driver/package.nix @@ -1,36 +1,35 @@ { lib, stdenv, - mkDerivation, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, - qtbase, + qt5, libglvnd, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "xp-pen-g430-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; + src = fetchzip { + url = "https://archive.org/download/linux-pentablet-v-1.2.13.1.tar.gz-20200428/Linux_Pentablet_V1.2.13.1.tar.gz%2820200428%29.zip/Linux_Pentablet_V1.2.13.1.tar.gz"; + name = "xp-pen-g430-driver-${version}.tar.gz"; + hash = "sha256-Wavf4EAzR/NX3GOfdAEdFX08gkD03FVvAkIl37Zmipc="; + }; nativeBuildInputs = [ autoPatchelfHook + qt5.wrapQtAppsHook ]; buildInputs = [ libusb1 libX11 libXtst - qtbase + qt5.qtbase libglvnd (lib.getLib stdenv.cc.cc) ]; @@ -41,12 +40,12 @@ mkDerivation rec { cp config.xml $out/bin/config.xml ''; - meta = with lib; { + meta = { homepage = "https://www.xp-pen.com/download-46.html"; description = "Driver for XP-PEN Pentablet drawing tablets"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f4de0910ec4..c87c1222a9cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16409,8 +16409,6 @@ with pkgs; xp-pen-deco-01-v2-driver = libsForQt5.xp-pen-deco-01-v2-driver; - xp-pen-g430-driver = libsForQt5.xp-pen-g430-driver; - newlib = callPackage ../development/misc/newlib { stdenv = stdenvNoLibc; }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index e4d3d4582ab0..2453bc438f00 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -321,8 +321,6 @@ makeScopeWithSplicing' { xp-pen-deco-01-v2-driver = callPackage ../os-specific/linux/xp-pen-drivers/deco-01-v2 { }; - xp-pen-g430-driver = callPackage ../os-specific/linux/xp-pen-drivers/g430 { }; - xwaylandvideobridge = callPackage ../tools/wayland/xwaylandvideobridge { }; } ))