From 4ba1c06c894953562e4542a702f90568d8c6c8d7 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 30 Apr 2010 20:40:11 +0000 Subject: [PATCH] Support nepomuk and marble in digikam. Also stop passing lib. svn path=/nixpkgs/trunk/; revision=21465 --- pkgs/desktops/kde-4.4/default.nix | 6 +++--- pkgs/desktops/kde-4.4/extragear/digikam/default.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index d74770355e7..b920dceb511 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -220,9 +220,9 @@ pkgs.recurseIntoAttrs (rec { }; digikam = import ./extragear/digikam { - inherit (pkgs) stdenv fetchurl lib cmake qt4 lcms jasper libgphoto2 gettext; - inherit kdelibs kdepimlibs kdegraphics; - inherit automoc4 phonon qimageblitz qca2 eigen; + inherit (pkgs) stdenv fetchurl cmake qt4 lcms jasper libgphoto2 gettext; + inherit kdelibs kdepimlibs kdegraphics kdeedu; + inherit automoc4 phonon qimageblitz qca2 eigen soprano; }; filelight = import ./extragear/filelight { diff --git a/pkgs/desktops/kde-4.4/extragear/digikam/default.nix b/pkgs/desktops/kde-4.4/extragear/digikam/default.nix index e1d2f2864c6..29e6d38c0b9 100644 --- a/pkgs/desktops/kde-4.4/extragear/digikam/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/digikam/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, lib, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, -kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext}: +{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, +kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu }: stdenv.mkDerivation rec { name = "digikam-1.2.0"; @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen - lcms jasper libgphoto2 kdepimlibs gettext ]; + lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu ]; cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ]; meta = { description = "Photo Management Program"; license = "GPL"; homepage = http://www.digikam.org; - maintainers = [ lib.maintainers.viric ]; - platforms = with lib.platforms; linux; + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.linux; }; }