git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #130007 from FliegendeWurst/spectacle-annotate
commitae04cbf6b41ab637904c98c9185607543de3ae1d authorSandro <sandro.jaeckel@gmail.com> dateThu 15 Jul 2021, 21:15 (5 years ago) parentbc9027b6f49212
4 files changed+58−3
compare with master
unifiedsplit
pkgs/applications/kde/spectacle.nix+6−3 pkgs/development/libraries/kcolorpicker/default.nix+24 pkgs/development/libraries/kimageannotator/default.nix+24 pkgs/top-level/qt5-packages.nix+4
pkgs/applications/kde/spectacle.nix+6−3
@@ -4,17 +4,20 @@
44 ki18n, xcb-util-cursor,
55 kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins,
66 knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
7− qtx11extras, knewstuff, kwayland, qttools
7+ qtbase, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
88}:
99
1010mkDerivation {
1111 pname = "spectacle";
12− meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
12+ meta = with lib; {
13+ maintainers = with maintainers; [ ttuegel ];
14+ broken = versionOlder qtbase.version "5.15";
15+ };
1316 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
1417 buildInputs = [
1518 kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
1619 kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor
17− knewstuff kwayland
20+ knewstuff kwayland kcolorpicker kimageannotator
1821 ];
1922 postPatch = ''
2023 substituteInPlace desktop/org.kde.spectacle.desktop.cmake \
pkgs/development/libraries/kcolorpicker/default.nixnew file+24
@@ -0,0 +1,24 @@
1+{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase }:
2+
3+mkDerivation rec {
4+ pname = "kcolorpicker";
5+ version = "0.1.6";
6+
7+ src = fetchFromGitHub {
8+ owner = "ksnip";
9+ repo = "kColorPicker";
10+ rev = "v${version}";
11+ sha256 = "1167xwk75yiz697vddbz3lq42l7ckhyl2cvigy4m05qgg9693ksd";
12+ };
13+
14+ nativeBuildInputs = [ cmake ];
15+ buildInputs = [ qtbase ];
16+
17+ meta = with lib; {
18+ description = "Qt based Color Picker with popup menu";
19+ homepage = "https://github.com/ksnip/kColorPicker";
20+ license = licenses.lgpl3Plus;
21+ maintainers = with maintainers; [ fliegendewurst ];
22+ platforms = platforms.linux;
23+ };
24+}
pkgs/development/libraries/kimageannotator/default.nixnew file+24
@@ -0,0 +1,24 @@
1+{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, kcolorpicker, qttools }:
2+
3+mkDerivation rec {
4+ pname = "kimageannotator";
5+ version = "0.5.1";
6+
7+ src = fetchFromGitHub {
8+ owner = "ksnip";
9+ repo = "kImageAnnotator";
10+ rev = "v${version}";
11+ sha256 = "0hfvrd78lgwd7bccz0fx2pr7g0v3s401y5plra63rxwk55ffkxf8";
12+ };
13+
14+ nativeBuildInputs = [ cmake qttools ];
15+ buildInputs = [ qtbase kcolorpicker ];
16+
17+ meta = with lib; {
18+ description = "Tool for annotating images";
19+ homepage = "https://github.com/ksnip/kImageAnnotator";
20+ license = licenses.lgpl3Plus;
21+ maintainers = with maintainers; [ fliegendewurst ];
22+ platforms = platforms.linux;
23+ };
24+}
pkgs/top-level/qt5-packages.nix+4
@@ -80,12 +80,16 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // {
8080
8181 kde2-decoration = callPackage ../data/themes/kde2 { };
8282
83+ kcolorpicker = callPackage ../development/libraries/kcolorpicker { };
84+
8385 kdiagram = callPackage ../development/libraries/kdiagram { };
8486
8587 kdsoap = callPackage ../development/libraries/kdsoap { };
8688
8789 kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { };
8890
91+ kimageannotator = callPackage ../development/libraries/kimageannotator { };
92+
8993 kproperty = callPackage ../development/libraries/kproperty { };
9094
9195 kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { };