digikam: minor cleanups

This commit is contained in:
Peter Hoeg 2017-10-21 14:42:00 +08:00
parent 70b3fbde6e
commit c41d794ecb
2 changed files with 4 additions and 5 deletions

View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules, wrapGAppsHook { mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
# For `digitaglinktree` # For `digitaglinktree`
, perl, sqlite , perl, sqlite
@ -33,8 +33,8 @@
, liblqr1 , liblqr1
, libqtav , libqtav
, libusb1 , libusb1
, mesa
, marble , marble
, mesa
, mysql , mysql
, opencv3 , opencv3
, pcre , pcre
@ -53,11 +53,11 @@ mkDerivation rec {
version = "5.7.0"; version = "5.7.0";
src = fetchurl { src = fetchurl {
url = "http://download.kde.org/stable/digikam/${name}.tar.xz"; url = "mirror://kde/stable/digikam/${name}.tar.xz";
sha256 = "1xah079g47fih8l9qy1ifppfvmq5yms5y1z54nvxdyz8nsszy19n"; sha256 = "1xah079g47fih8l9qy1ifppfvmq5yms5y1z54nvxdyz8nsszy19n";
}; };
nativeBuildInputs = [ cmake extra-cmake-modules kdoctools wrapGAppsHook ]; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
buildInputs = [ buildInputs = [
bison bison

View File

@ -17613,7 +17613,6 @@ 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;
boost = boost160;
}; };
displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {}; displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {};