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

digikam: 5.7.0 -> 5.8.0

Browse Source 
See: https://raw.githubusercontent.com/KDE/digikam/v5.8.0/project/NEWS.5.8.0
This commit is contained in:
Bas van Dijk 2018-01-09 20:54:37 +01:00
parent 18ceefc2a1
commit 9bafe42450
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/applications/graphics/digikam/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook, fetchpatch { mkDerivation, lib, fetchFromGitHub, cmake, doxygen, extra-cmake-modules, wrapGAppsHook, fetchpatch
# For `digitaglinktree` # For `digitaglinktree`
, perl, sqlite , perl, sqlite
@ -50,11 +50,13 @@
mkDerivation rec { mkDerivation rec {
name = "digikam-${version}"; name = "digikam-${version}";
version = "5.7.0"; version = "5.8.0";
src = fetchurl { src = fetchFromGitHub {
url = "mirror://kde/stable/digikam/${name}.tar.xz"; owner = "KDE";
sha256 = "1xah079g47fih8l9qy1ifppfvmq5yms5y1z54nvxdyz8nsszy19n"; repo = "digikam";
rev = "v${version}";
sha256 = "1bvidg0fn92xvw5brhb34lm7m4iy4jb5xpvnhbgh8vik2m4n41w1";
}; };
nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
@ -83,8 +85,7 @@ mkDerivation rec {
qtsvg qtsvg
qtwebkit qtwebkit
# https://bugs.kde.org/show_bug.cgi?id=387960 kcalcore
#kcalcore
kconfigwidgets kconfigwidgets
kcoreaddons kcoreaddons
kfilemetadata kfilemetadata
@ -112,20 +113,6 @@ mkDerivation rec {
--replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"
''; '';
patches = [
# fix Qt-5.9.3 empty album problem
(fetchpatch {
url = "https://cgit.kde.org/digikam.git/patch/?id=855ba5b7d4bc6337234720a72ea824ddd3b32e5b";
sha256 = "0zk8p182piy6xn9v0mhwawya9ciq596vql1qc3lgnx371a97mmni";
})
];
patchFlags = "-d core -p1";
# `en make -f core/utilities/assistants/expoblending/CMakeFiles/expoblending_src.dir/build.make core/utilities/assistants/expoblending/CMakeFiles/expoblending_src.dir/manager/expoblendingthread.cpp.o`:
# digikam_version.h:37:24: fatal error: gitversion.h: No such file or directory
enableParallelBuilding = false;
meta = with lib; { meta = with lib; {
description = "Photo Management Program"; description = "Photo Management Program";
license = licenses.gpl2; license = licenses.gpl2;

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

@ -18074,6 +18074,7 @@ with pkgs;
digikam = libsForQt5.callPackage ../applications/graphics/digikam { digikam = libsForQt5.callPackage ../applications/graphics/digikam {
inherit (plasma5) oxygen; inherit (plasma5) oxygen;
inherit (kdeApplications) kcalcore; inherit (kdeApplications) kcalcore;
opencv3 = opencv3.override { enableContrib = true; };
}; };
displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {}; displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {};