diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-26 13:49:23 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-26 13:49:23 +0000 |
commit | 597412252ad2d5c24a2cc457bff3b7c5d3b98179 (patch) | |
tree | 0a93b39b69938b1cd88c82670d66923d3c8411e3 /pkgs/applications | |
parent | 8c26e61e42ee0fb4ab41535698920872e7f09ffe (diff) | |
download | nixlib-597412252ad2d5c24a2cc457bff3b7c5d3b98179.tar nixlib-597412252ad2d5c24a2cc457bff3b7c5d3b98179.tar.gz nixlib-597412252ad2d5c24a2cc457bff3b7c5d3b98179.tar.bz2 nixlib-597412252ad2d5c24a2cc457bff3b7c5d3b98179.tar.lz nixlib-597412252ad2d5c24a2cc457bff3b7c5d3b98179.tar.xz nixlib-597412252ad2d5c24a2cc457bff3b7c5d3b98179.tar.zst nixlib-597412252ad2d5c24a2cc457bff3b7c5d3b98179.zip |
Wrap kde-related packages in kdePackagesFor
This lets hydra build kde packages for all available KDE releases. Will commit NixOS-fix in a few minutes. svn path=/nixpkgs/trunk/; revision=28833
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/graphics/kipi-plugins/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/misc/bibletime/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/krename/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/p2p/ktorrent/default.nix | 1 |
4 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix index 96ab03a2784d..e551b1523904 100644 --- a/pkgs/applications/graphics/kipi-plugins/default.nix +++ b/pkgs/applications/graphics/kipi-plugins/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, kdelibs, qimageblitz, qca2, libkexiv2, libkdcraw, libkipi -, libksane, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod, gdk_pixbuf -, qjson , pkgconfig }: +{ stdenv, fetchurl, kdelibs, qimageblitz, qca2, kdepimlibs, libxml2, libxslt +, gettext, opencv, libgpod, gdk_pixbuf , qjson, pkgconfig +, cmake, automoc4 +, kdegraphics, libkexiv2 ? kdegraphics, libkdcraw ? kdegraphics +, libkipi ? kdegraphics, libksane ? kdegraphics }: stdenv.mkDerivation rec { name = "kipi-plugins-1.9.0"; @@ -15,7 +17,7 @@ stdenv.mkDerivation rec { libksane libxslt gettext opencv libgpod gdk_pixbuf qjson ]; - buildNativeInputs = [ pkgconfig ]; + buildNativeInputs = [ pkgconfig cmake automoc4 ]; meta = { description = "Photo Management Program"; diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index e7ae8b4f1757..53f3a8dee8d8 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, sword, qt, boost, cluceneCore}: +{stdenv, fetchurl, cmake, sword, qt4, boost, cluceneCore}: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "bibletime-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/bibletime/BibleTime%202/BibleTime%202%20source%20code/${name}.tar.bz2"; + url = "mirror://sourceforge/bibletime/${name}.tar.bz2"; sha256 = "0171hlwg4rjv93b3gwcyv3nsj2kzwf4n8f6jw6ld18x7xmk9rkdg"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { export SWORD_HOME=${sword}; ''; - buildInputs = [ cmake sword qt boost cluceneCore ]; + buildInputs = [ cmake sword qt4 boost cluceneCore ]; cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug"; diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index 373824b419f4..e5af706d41c9 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext, qt, phonon }: +{ stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext, qt4, phonon }: stdenv.mkDerivation rec { name = "krename-4.0.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "12qhclw1vbg5bv6619qd4408y8d1w26499gcr8gwhgfzk0v83hic"; }; - buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext qt phonon ]; + buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext qt4 phonon ]; meta = { homepage = http://www.krename.net; diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index dfd65f8d0cc8..e4cb4e9089ab 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { description = "KDE integrated BtTorrent client"; homepage = http://ktorrent.org; maintainers = with stdenv.lib.maintainers; [ sander urkud ]; + inherit (libktorrent.meta) platforms; }; } |