Merge pull request #294939 from FliegendeWurst/kcolorpicker-0.3.1

kcolorpicker: 0.3.0 -> 0.3.1 & kimageannotator: 0.7.0 -> 0.7.1
This commit is contained in:
Peder Bergebakken Sundt 2024-04-13 23:40:53 +02:00 committed by GitHub
commit a4d57bd429
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 8 deletions

View File

@ -4,13 +4,13 @@ let
isQt6 = lib.versions.major qtbase.version == "6";
in stdenv.mkDerivation rec {
pname = "kcolorpicker";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "ksnip";
repo = "kColorPicker";
rev = "v${version}";
hash = "sha256-gkjlIiLB3/074EEFrQUa0djvVt/C44O3afqqNis64P0=";
hash = "sha256-FG/A4pDNuhGPOeJNZlsnX3paEy4ibJVWKxn8rVUGpN8=";
};
nativeBuildInputs = [ cmake ];

View File

@ -4,13 +4,13 @@ let
isQt6 = lib.versions.major qtbase.version == "6";
in stdenv.mkDerivation rec {
pname = "kimageannotator";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "ksnip";
repo = "kImageAnnotator";
rev = "v${version}";
hash = "sha256-Dq9CM/D3nA7MaY9rfwqF/UAw/+1ptKLf3P8jhFdngKk=";
hash = "sha256-LFou8gTF/XDBLNQbA4uurYJHQl7yOTKe2OGklUsmPrg=";
};
nativeBuildInputs = [ cmake qttools ];

View File

@ -31,10 +31,6 @@ stdenv.mkDerivation rec {
})
];
postPatch = ''
substituteInPlace src/CMakeLists.txt --replace-fail "kColorPicker::kColorPicker" "kColorPicker::kColorPicker-Qt5"
'';
nativeBuildInputs = [
cmake
extra-cmake-modules