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

kcolorpicker, kimageannotator: update, add Qt6 support

Browse Source
This commit is contained in:
K900 2024-02-28 15:00:45 +03:00
parent 470ce55e71
commit a06fbd061a
3 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/kcolorpicker/default.nix
View File

@ -1,19 +1,29 @@
{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase }:
{ lib, stdenv, fetchFromGitHub, cmake, qtbase }:
mkDerivation rec {
let
isQt6 = lib.versions.major qtbase.version == "6";
in stdenv.mkDerivation rec {
pname = "kcolorpicker";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "ksnip";
repo = "kColorPicker";
rev = "v${version}";
sha256 = "sha256-ahmMj/yzQiRP9oJwDuhJGxe849kxNsoGFDZ2CGQNhKs=";
hash = "sha256-gkjlIiLB3/074EEFrQUa0djvVt/C44O3afqqNis64P0=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase ];
cmakeFlags = [
(lib.cmakeBool "BUILD_WITH_QT6" isQt6)
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
];
# Library only
dontWrapQtApps = true;
meta = with lib; {
description = "Qt based Color Picker with popup menu";
homepage = "https://github.com/ksnip/kColorPicker";

21
pkgs/development/libraries/kimageannotator/default.nix
View File

@ -1,18 +1,29 @@
{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, kcolorpicker, qttools }:
{ lib, stdenv, fetchFromGitHub, cmake, qttools, qtbase, qtsvg, kcolorpicker }:
mkDerivation rec {
let
isQt6 = lib.versions.major qtbase.version == "6";
in stdenv.mkDerivation rec {
pname = "kimageannotator";
version = "0.6.1";
version = "0.7.0";
src = fetchFromGitHub {
owner = "ksnip";
repo = "kImageAnnotator";
rev = "v${version}";
sha256 = "sha256-lNoYAJ5yTC5H0gWPVkBGhLroRhFCPyC1DsVBy0IrqL4=";
hash = "sha256-Dq9CM/D3nA7MaY9rfwqF/UAw/+1ptKLf3P8jhFdngKk=";
};
nativeBuildInputs = [ cmake qttools ];
buildInputs = [ qtbase kcolorpicker ];
buildInputs = [ qtbase qtsvg ];
propagatedBuildInputs = [ kcolorpicker ];
cmakeFlags = [
(lib.cmakeBool "BUILD_WITH_QT6" isQt6)
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
];
# Library only
dontWrapQtApps = true;
meta = with lib; {
description = "Tool for annotating images";

3
pkgs/top-level/qt6-packages.nix
View File

@ -33,6 +33,9 @@ makeScopeWithSplicing' {
kdsoap = callPackage ../development/libraries/kdsoap { };
kcolorpicker = callPackage ../development/libraries/kcolorpicker { };
kimageannotator = callPackage ../development/libraries/kimageannotator { };
futuresql = callPackage ../development/libraries/futuresql { };
kquickimageedit = callPackage ../development/libraries/kquickimageedit { };
libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { };