diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-01-09 20:54:37 +0100 |
|---|---|---|
| committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-01-09 20:54:37 +0100 |
| commit | 9bafe4245041aa8856b32e6d26520c3681bc0902 (patch) | |
| tree | 4044f04232ebdbf83650a4a4f78c40c95fc16930 /pkgs/applications/graphics/digikam | |
| parent | 18ceefc2a182efe85c88b25feff0b35dac8cf6e5 (diff) | |
| download | nixpkgs-9bafe4245041aa8856b32e6d26520c3681bc0902.tar nixpkgs-9bafe4245041aa8856b32e6d26520c3681bc0902.tar.gz nixpkgs-9bafe4245041aa8856b32e6d26520c3681bc0902.tar.bz2 nixpkgs-9bafe4245041aa8856b32e6d26520c3681bc0902.tar.lz nixpkgs-9bafe4245041aa8856b32e6d26520c3681bc0902.tar.xz nixpkgs-9bafe4245041aa8856b32e6d26520c3681bc0902.tar.zst nixpkgs-9bafe4245041aa8856b32e6d26520c3681bc0902.zip | |
digikam: 5.7.0 -> 5.8.0
See: https://raw.githubusercontent.com/KDE/digikam/v5.8.0/project/NEWS.5.8.0
Diffstat (limited to 'pkgs/applications/graphics/digikam')
| -rw-r--r-- | pkgs/applications/graphics/digikam/default.nix | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 9a26dcdaa6a..d2ef35fcca8 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -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` , perl, sqlite @@ -50,11 +50,13 @@ mkDerivation rec { name = "digikam-${version}"; - version = "5.7.0"; + version = "5.8.0"; - src = fetchurl { - url = "mirror://kde/stable/digikam/${name}.tar.xz"; - sha256 = "1xah079g47fih8l9qy1ifppfvmq5yms5y1z54nvxdyz8nsszy19n"; + src = fetchFromGitHub { + owner = "KDE"; + repo = "digikam"; + rev = "v${version}"; + sha256 = "1bvidg0fn92xvw5brhb34lm7m4iy4jb5xpvnhbgh8vik2m4n41w1"; }; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; @@ -83,8 +85,7 @@ mkDerivation rec { qtsvg qtwebkit - # https://bugs.kde.org/show_bug.cgi?id=387960 - #kcalcore + kcalcore kconfigwidgets kcoreaddons kfilemetadata @@ -112,20 +113,6 @@ mkDerivation rec { --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; { description = "Photo Management Program"; license = licenses.gpl2; |