summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2017-10-21 14:42:00 +0800
committerPeter Hoeg <peter@hoeg.com>2017-10-23 22:49:46 +0800
commitc41d794ecbdb56c9c576a1a7f59386d63ec48aed (patch)
tree007b79d58811cad50dd62cca1e37d8539acda3af
parent70b3fbde6e32d781c160156feffddbed6e6240d0 (diff)
downloadnixlib-c41d794ecbdb56c9c576a1a7f59386d63ec48aed.tar
nixlib-c41d794ecbdb56c9c576a1a7f59386d63ec48aed.tar.gz
nixlib-c41d794ecbdb56c9c576a1a7f59386d63ec48aed.tar.bz2
nixlib-c41d794ecbdb56c9c576a1a7f59386d63ec48aed.tar.lz
nixlib-c41d794ecbdb56c9c576a1a7f59386d63ec48aed.tar.xz
nixlib-c41d794ecbdb56c9c576a1a7f59386d63ec48aed.tar.zst
nixlib-c41d794ecbdb56c9c576a1a7f59386d63ec48aed.zip
digikam: minor cleanups
-rw-r--r--pkgs/applications/graphics/digikam/default.nix8
-rw-r--r--pkgs/top-level/all-packages.nix1
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 44ee807fe984..a62940ff7038 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules, wrapGAppsHook
+{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
 
 # For `digitaglinktree`
 , perl, sqlite
@@ -33,8 +33,8 @@
 , liblqr1
 , libqtav
 , libusb1
-, mesa
 , marble
+, mesa
 , mysql
 , opencv3
 , pcre
@@ -53,11 +53,11 @@ mkDerivation rec {
   version = "5.7.0";
 
   src = fetchurl {
-    url = "http://download.kde.org/stable/digikam/${name}.tar.xz";
+    url = "mirror://kde/stable/digikam/${name}.tar.xz";
     sha256 = "1xah079g47fih8l9qy1ifppfvmq5yms5y1z54nvxdyz8nsszy19n";
   };
 
-  nativeBuildInputs = [ cmake extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
 
   buildInputs = [
     bison
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab2d1dd75c02..13de557985c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17613,7 +17613,6 @@ with pkgs;
   digikam = libsForQt5.callPackage ../applications/graphics/digikam {
     inherit (plasma5) oxygen;
     inherit (kdeApplications) kcalcore;
-    boost = boost160;
   };
 
   displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {};