diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-09-22 18:04:55 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-09-22 18:04:55 +0000 |
commit | 58c09d0ff2ad25ec9704ef69376f549e1b1f6ca3 (patch) | |
tree | cecdb793753416bb64915f54d01ccf5e22c8d965 /pkgs/desktops/kde-4.4/default.nix | |
parent | 3b693da649b81a0eac7adef5b04418558a6e9300 (diff) | |
download | nixlib-58c09d0ff2ad25ec9704ef69376f549e1b1f6ca3.tar nixlib-58c09d0ff2ad25ec9704ef69376f549e1b1f6ca3.tar.gz nixlib-58c09d0ff2ad25ec9704ef69376f549e1b1f6ca3.tar.bz2 nixlib-58c09d0ff2ad25ec9704ef69376f549e1b1f6ca3.tar.lz nixlib-58c09d0ff2ad25ec9704ef69376f549e1b1f6ca3.tar.xz nixlib-58c09d0ff2ad25ec9704ef69376f549e1b1f6ca3.tar.zst nixlib-58c09d0ff2ad25ec9704ef69376f549e1b1f6ca3.zip |
Move koffice to applications/office
svn path=/nixpkgs/trunk/; revision=23900
Diffstat (limited to 'pkgs/desktops/kde-4.4/default.nix')
-rw-r--r-- | pkgs/desktops/kde-4.4/default.nix | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index c24867359a3c..f67802e055cc 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -283,15 +283,7 @@ pkgs.recurseIntoAttrs (rec { inherit automoc4 phonon; }; - koffice = import ./extragear/koffice { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl lcms exiv2 giflib libxml2 libxslt boost glew; - inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd libgsf fftw; - inherit kdelibs kdepimlibs; - inherit automoc4 phonon qimageblitz qca2 eigen soprano; - poppler = pkgs.popplerQt4; - }; - - inherit (pkgs) konversation yakuake ktorrent; + inherit (pkgs) konversation yakuake ktorrent koffice; gtk_qt_engine = import ./extragear/gtk-qt-engine { inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext; |