diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 10:11:01 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 15:08:12 -0500 |
commit | 2e0589b4ca8f43dbce3e5af91c6e4375681ebee5 (patch) | |
tree | e2b3b4f6ec45ed280d298363f3a40eb2a510f789 /pkgs/applications/graphics/digikam/default.nix | |
parent | dd264938bc1df93a66f7647d9ace267a241a3da7 (diff) |
kde414: build with kdelibs-4.14.12
Upstream changes to the build system required adjusting many packages' dependencies. On the Nixpkgs side, we no longer propagate the dependency on cmake (to reduce closure size), so downstream dependencies had to be adjusted for most packages that depend on kdelibs.
Diffstat (limited to 'pkgs/applications/graphics/digikam/default.nix')
-rw-r--r-- | pkgs/applications/graphics/digikam/default.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index b07b889ca13e6..bdf8077624db2 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, automoc4, boost, shared_desktop_ontologies, cmake , eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun , libgphoto2, libjpeg, libkdcraw, libkexiv2, libkipi, libpgf, libtiff -, libusb1, liblqr1, marble, mysql, opencv, phonon, pkgconfig, qca2 -, qimageblitz, qjson, qt4, soprano +, libusb1, liblqr1, marble, mysql, opencv, perl, phonon, pkgconfig +, qca2, qimageblitz, qjson, qt4, soprano }: stdenv.mkDerivation rec { @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { sha256 = "081ldsaf3frf5khznjd3sxkjmi4dyp6w6nqnc2a0agkk0kxkl10m"; }; - nativeBuildInputs = [ cmake automoc4 pkgconfig ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; buildInputs = [ - boost eigen gettext jasper kdelibs kdepimlibs lcms lensfun - libgphoto2 libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf - libtiff marble mysql.lib opencv phonon qca2 qimageblitz qjson qt4 + boost eigen jasper kdelibs kdepimlibs lcms lensfun libgphoto2 + libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf libtiff marble + mysql.lib opencv phonon qca2 qimageblitz qjson qt4 shared_desktop_ontologies soprano ]; @@ -26,7 +26,11 @@ stdenv.mkDerivation rec { KDEDIRS="${marble}:${qjson}"; # Help digiKam find libusb, otherwise gphoto2 support is disabled - cmakeFlags = "-DLIBUSB_LIBRARIES=${libusb1}/lib -DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0 -DDIGIKAMSC_COMPILE_LIBKFACE=ON"; + cmakeFlags = [ + "-DLIBUSB_LIBRARIES=${libusb1}/lib" + "-DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0" + "-DDIGIKAMSC_COMPILE_LIBKFACE=ON" + ]; enableParallelBuilding = true; |