diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix new file mode 100644 index 00000000000..907c5ca3e22 --- /dev/null +++ b/pkgs/applications/graphics/digikam/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, kdelibs, exiv2, libXt, libXext, zlib, libjpeg, perl, qt3, + libpng, expat, cmake }: + +stdenv.mkDerivation { + name = "digikam-1.0.0"; + + src = fetchurl { + url = mirror://sourceforge/digikam/digikam-1.0.0.tar.bz2; + sha256 = "0qblqyjn0vas8hyqn5s9rr401d93cagk53y3j8kch0mr0bk706bk"; + }; + +/* + configurePhase = '' + LDFLAGS="$LDFLAGS -ljpeg" ./configure --without-arts --prefix=$out + ''; +*/ + + buildInputs = [ kdelibs exiv2 libXt libXext zlib libjpeg perl qt3 libpng expat cmake ]; + + meta = { + homepage = http://digikam.sourceforge.net/; + description = "KDE 3.x photo viewer"; + # license = "GPLv2+"; + }; +} diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix index 9a3968fe780..4aac5eafd9f 100644 --- a/pkgs/desktops/kde-4.3/default.nix +++ b/pkgs/desktops/kde-4.3/default.nix @@ -218,6 +218,12 @@ pkgs.recurseIntoAttrs (rec { inherit automoc4 phonon strigi soprano qca2; }; + 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; + }; + filelight = import ./extragear/filelight { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl; inherit kdelibs kdebase_workspace; @@ -229,6 +235,12 @@ pkgs.recurseIntoAttrs (rec { inherit kdelibs; inherit automoc4 phonon; }; + + kipiplugins = import ./extragear/kipi-plugins { + inherit (pkgs) stdenv fetchurl lib cmake qt4 libxml2 libxslt gettext; + inherit kdelibs kdepimlibs kdegraphics; + inherit automoc4 phonon qimageblitz qca2; + }; kmplayer = import ./extragear/kmplayer { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext dbus_glib; diff --git a/pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix b/pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix new file mode 100644 index 00000000000..c77a06e9b85 --- /dev/null +++ b/pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, lib, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, +kdegraphics, kdepimlibs, libxml2, libxslt, gettext}: + +stdenv.mkDerivation { + name = "kipi-plugins-0.9.0"; + + src = fetchurl { + url = mirror://sourceforge/kipi/kipi-plugins-0.9.0.tar.bz2; + sha256 = "0wx1r607q8i4v55k8qjzz7wn8rfd86nniq3h3s7dgnddq7x17fqn"; + }; + + includeAllQtDirs=true; + buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs + libxml2 libxslt gettext ]; + CMAKE_PREFIX_PATH = kdepimlibs; + cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ]; + meta = { + description = "Photo Management Program"; + license = "GPL"; + homepage = http://www.koffice.org; + maintainers = [ lib.maintainers.viric ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b04dcd3f2e..aedd867589e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6605,6 +6605,12 @@ let inherit (gtkLibs) gtk glib; }; + digikam = import ../applications/graphics/digikam { + inherit stdenv fetchurl exiv2 zlib libjpeg perl libpng expat qt3 cmake; + inherit (kde3) kdelibs; + inherit (xlibs) libXt libXext; + }; + djvulibre = import ../applications/misc/djvulibre { inherit stdenv fetchurl libjpeg libtiff libungif zlib ghostscript libpng x11 mesa;