Merge pull request #130007 from FliegendeWurst/spectacle-annotate

This commit is contained in:
Sandro 2021-07-15 21:15:31 +02:00 committed by GitHub
commit ae04cbf6b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 58 additions and 3 deletions

View file

@ -4,17 +4,20 @@
ki18n, xcb-util-cursor,
kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins,
knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
qtx11extras, knewstuff, kwayland, qttools
qtbase, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
}:
mkDerivation {
pname = "spectacle";
meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
meta = with lib; {
maintainers = with maintainers; [ ttuegel ];
broken = versionOlder qtbase.version "5.15";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor
knewstuff kwayland
knewstuff kwayland kcolorpicker kimageannotator
];
postPatch = ''
substituteInPlace desktop/org.kde.spectacle.desktop.cmake \

View file

@ -0,0 +1,24 @@
{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase }:
mkDerivation rec {
pname = "kcolorpicker";
version = "0.1.6";
src = fetchFromGitHub {
owner = "ksnip";
repo = "kColorPicker";
rev = "v${version}";
sha256 = "1167xwk75yiz697vddbz3lq42l7ckhyl2cvigy4m05qgg9693ksd";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase ];
meta = with lib; {
description = "Qt based Color Picker with popup menu";
homepage = "https://github.com/ksnip/kColorPicker";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ fliegendewurst ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,24 @@
{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, kcolorpicker, qttools }:
mkDerivation rec {
pname = "kimageannotator";
version = "0.5.1";
src = fetchFromGitHub {
owner = "ksnip";
repo = "kImageAnnotator";
rev = "v${version}";
sha256 = "0hfvrd78lgwd7bccz0fx2pr7g0v3s401y5plra63rxwk55ffkxf8";
};
nativeBuildInputs = [ cmake qttools ];
buildInputs = [ qtbase kcolorpicker ];
meta = with lib; {
description = "Tool for annotating images";
homepage = "https://github.com/ksnip/kImageAnnotator";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ fliegendewurst ];
platforms = platforms.linux;
};
}

View file

@ -80,12 +80,16 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // {
kde2-decoration = callPackage ../data/themes/kde2 { };
kcolorpicker = callPackage ../development/libraries/kcolorpicker { };
kdiagram = callPackage ../development/libraries/kdiagram { };
kdsoap = callPackage ../development/libraries/kdsoap { };
kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { };
kimageannotator = callPackage ../development/libraries/kimageannotator { };
kproperty = callPackage ../development/libraries/kproperty { };
kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { };