diff options
| author | Tom Hall <tahall256@protonmail.ch> | 2020-12-05 12:47:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-05 13:47:44 +0100 |
| commit | a6e78f015cda426447ee0771377c4a810d366988 (patch) | |
| tree | 5e1a9adf92cd9ccb58fabc851a0ed036eb8df8de | |
| parent | 29045c2322178bc15956cf26c659b9e98010608b (diff) | |
| download | nixpkgs-a6e78f015cda426447ee0771377c4a810d366988.tar nixpkgs-a6e78f015cda426447ee0771377c4a810d366988.tar.gz nixpkgs-a6e78f015cda426447ee0771377c4a810d366988.tar.bz2 nixpkgs-a6e78f015cda426447ee0771377c4a810d366988.tar.lz nixpkgs-a6e78f015cda426447ee0771377c4a810d366988.tar.xz nixpkgs-a6e78f015cda426447ee0771377c4a810d366988.tar.zst nixpkgs-a6e78f015cda426447ee0771377c4a810d366988.zip | |
wacomtablet: Fix build with Qt5.15, pending new release (#104660)
Also update homepage
| -rw-r--r-- | pkgs/tools/misc/wacomtablet/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/tools/misc/wacomtablet/default.nix b/pkgs/tools/misc/wacomtablet/default.nix index aa631d44114..5ff2800496a 100644 --- a/pkgs/tools/misc/wacomtablet/default.nix +++ b/pkgs/tools/misc/wacomtablet/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchurl, extra-cmake-modules, qtx11extras, +{ lib, mkDerivation, fetchurl, fetchpatch, extra-cmake-modules, qtx11extras, plasma-workspace, libwacom, xf86_input_wacom }: @@ -9,6 +9,12 @@ mkDerivation rec { url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; sha256 = "197pwpl87gqlnza36bp68jvw8ww25znk08acmi8bpz7n84xfc368"; }; + patches = [ + (fetchpatch { + url = "https://invent.kde.org/system/wacomtablet/commit/4f73ff02b3efd5e8728b18fcf1067eca166704ee.patch"; + sha256 = "0185gbh1vywfz8a3wnvncmzdk0dd189my4bzimkbh85rlrqq2nf8"; + }) + ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ @@ -22,7 +28,7 @@ mkDerivation rec { This module implements a GUI for the Wacom Linux Drivers and extends it with profile support to handle different button / pen layouts per profile. ''; - homepage = "https://cgit.kde.org/wacomtablet.git/about/"; + homepage = "https://invent.kde.org/system/wacomtablet"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.Thra11 ]; platforms = lib.platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f6b6976a75..953b997f555 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28279,7 +28279,7 @@ in vttest = callPackage ../tools/misc/vttest { }; - wacomtablet = libsForQt514.callPackage ../tools/misc/wacomtablet { }; + wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; wasmer = callPackage ../development/interpreters/wasmer { }; |