public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wacomtablet: Fix build with Qt5.15, pending new release (#104660) 

Also update homepage
This commit is contained in:
Tom Hall 2020-12-05 12:47:44 +00:00 committed by GitHub
parent 29045c2322
commit a6e78f015c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/misc/wacomtablet/default.nix
View File

@ -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 plasma-workspace, libwacom, xf86_input_wacom
}: }:
@ -9,6 +9,12 @@ mkDerivation rec {
url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
sha256 = "197pwpl87gqlnza36bp68jvw8ww25znk08acmi8bpz7n84xfc368"; sha256 = "197pwpl87gqlnza36bp68jvw8ww25znk08acmi8bpz7n84xfc368";
}; };
patches = [
(fetchpatch {
url = "https://invent.kde.org/system/wacomtablet/commit/4f73ff02b3efd5e8728b18fcf1067eca166704ee.patch";
sha256 = "0185gbh1vywfz8a3wnvncmzdk0dd189my4bzimkbh85rlrqq2nf8";
})
];
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ buildInputs = [
@ -22,7 +28,7 @@ mkDerivation rec {
This module implements a GUI for the Wacom Linux Drivers and extends it This module implements a GUI for the Wacom Linux Drivers and extends it
with profile support to handle different button / pen layouts per profile. 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; license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.Thra11 ]; maintainers = [ lib.maintainers.Thra11 ];
platforms = lib.platforms.linux; platforms = lib.platforms.linux;

2
pkgs/top-level/all-packages.nix
View File

@ -28279,7 +28279,7 @@ in
vttest = callPackage ../tools/misc/vttest { }; vttest = callPackage ../tools/misc/vttest { };
wacomtablet = libsForQt514.callPackage ../tools/misc/wacomtablet { }; wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { };
wasmer = callPackage ../development/interpreters/wasmer { }; wasmer = callPackage ../development/interpreters/wasmer { };