git.iko.soy/typeable/nixpkgs
on master help sign in
digikam: 6.0.0 -> 6.1.0 (#60042)

* digikam: 6.0.0 -> 6.1.0 * digikam: add dep, use ffmpeg_4 * digikam: set DK_PLUGIN_PATH to help find plugins

commitbc94dcf500286495e3c478a9f9322debc94c4304 authorWill Dietz <w@wdtz.org> dateFri 10 May 2019, 06:22 (8 years ago) parentdf47f8b
2 files changed+8−4
pkgs/applications/graphics/digikam/default.nix+6−3 pkgs/top-level/all-packages.nix+2−1
pkgs/applications/graphics/digikam/default.nix+6−3
@@ -8,6 +8,7 @@
88, qtsvg
99, qtwebengine
1010
11+, akonadi-contacts
1112, kcalcore
1213, kconfigwidgets
1314, kcoreaddons
@@ -50,14 +51,14 @@
5051}:
5152
5253mkDerivation rec {
53− name = "digikam-${version}";
54− version = "6.0.0";
54+ pname = "digikam";
55+ version = "6.1.0";
5556
5657 src = fetchFromGitHub {
5758 owner = "KDE";
5859 repo = "digikam";
5960 rev = "v${version}";
60− sha256 = "1ifvrn0bm7fp07d059rl4dy146qzdxafl36ipxg1fg00dkv95hh4";
61+ sha256 = "0h0jqfgpanhxfi3r7cgip58ppypqx79z6c5jj7i7f19hp2zziip8";
6162 };
6263
6364 nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
@@ -88,6 +89,7 @@ mkDerivation rec {
8889 qtsvg
8990 qtwebengine
9091
92+ akonadi-contacts
9193 kcalcore
9294 kconfigwidgets
9395 kcoreaddons
@@ -112,6 +114,7 @@ mkDerivation rec {
112114
113115 preFixup = ''
114116 gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]})
117+ gappsWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${qtbase.qtPluginPrefix}/${pname})
115118 substituteInPlace $out/bin/digitaglinktree \
116119 --replace "/usr/bin/perl" "${perl}/bin/perl" \
117120 --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"
pkgs/top-level/all-packages.nix+2−1
@@ -21172,7 +21172,8 @@ in
2117221172
2117321173 digikam = libsForQt5.callPackage ../applications/graphics/digikam {
2117421174 inherit (plasma5) oxygen;
21175− inherit (kdeApplications) kcalcore;
21175+ inherit (kdeApplications) akonadi-contacts kcalcore;
21176+ ffmpeg = ffmpeg_4;
2117621177 opencv3 = opencv3WithoutCuda;
2117721178 };
2117821179