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

digikam: 6.0.0 -> 6.1.0 (#60042)

Browse Source 
* digikam: 6.0.0 -> 6.1.0

* digikam: add dep, use ffmpeg_4

* digikam: set DK_PLUGIN_PATH to help find plugins
This commit is contained in:
Will Dietz 2019-05-10 06:22:06 -05:00 committed by Renaud
parent df47f8b147
commit bc94dcf500
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@
, qtsvg , qtsvg
, qtwebengine , qtwebengine
, akonadi-contacts
, kcalcore , kcalcore
, kconfigwidgets , kconfigwidgets
, kcoreaddons , kcoreaddons
@ -50,14 +51,14 @@
}: }:
mkDerivation rec { mkDerivation rec {
name = "digikam-${version}"; pname = "digikam";
version = "6.0.0"; version = "6.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KDE"; owner = "KDE";
repo = "digikam"; repo = "digikam";
rev = "v${version}"; rev = "v${version}";
sha256 = "1ifvrn0bm7fp07d059rl4dy146qzdxafl36ipxg1fg00dkv95hh4"; sha256 = "0h0jqfgpanhxfi3r7cgip58ppypqx79z6c5jj7i7f19hp2zziip8";
}; };
nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
@ -88,6 +89,7 @@ mkDerivation rec {
qtsvg qtsvg
qtwebengine qtwebengine
akonadi-contacts
kcalcore kcalcore
kconfigwidgets kconfigwidgets
kcoreaddons kcoreaddons
@ -112,6 +114,7 @@ mkDerivation rec {
preFixup = '' preFixup = ''
gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]}) gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]})
gappsWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${qtbase.qtPluginPrefix}/${pname})
substituteInPlace $out/bin/digitaglinktree \ substituteInPlace $out/bin/digitaglinktree \
--replace "/usr/bin/perl" "${perl}/bin/perl" \ --replace "/usr/bin/perl" "${perl}/bin/perl" \
--replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"

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

@ -21172,7 +21172,8 @@ in
digikam = libsForQt5.callPackage ../applications/graphics/digikam { digikam = libsForQt5.callPackage ../applications/graphics/digikam {
inherit (plasma5) oxygen; inherit (plasma5) oxygen;
inherit (kdeApplications) kcalcore; inherit (kdeApplications) akonadi-contacts kcalcore;
ffmpeg = ffmpeg_4;
opencv3 = opencv3WithoutCuda; opencv3 = opencv3WithoutCuda;
}; };