diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-10-05 17:44:33 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-10-05 17:44:33 +0000 |
commit | 673e66e3a3afb92d96fa806b7dc2e0cb615d0bd7 (patch) | |
tree | 66c52d2b0244a0179a7e390813988a9545f96270 /pkgs | |
parent | 4591f1fe519e6e49cb9ba5f908c9b80975491b93 (diff) | |
download | nixlib-673e66e3a3afb92d96fa806b7dc2e0cb615d0bd7.tar nixlib-673e66e3a3afb92d96fa806b7dc2e0cb615d0bd7.tar.gz nixlib-673e66e3a3afb92d96fa806b7dc2e0cb615d0bd7.tar.bz2 nixlib-673e66e3a3afb92d96fa806b7dc2e0cb615d0bd7.tar.lz nixlib-673e66e3a3afb92d96fa806b7dc2e0cb615d0bd7.tar.xz nixlib-673e66e3a3afb92d96fa806b7dc2e0cb615d0bd7.tar.zst nixlib-673e66e3a3afb92d96fa806b7dc2e0cb615d0bd7.zip |
Move most kde-extragear apps to top-level
svn path=/nixpkgs/trunk/; revision=24092
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/filelight/default.nix (renamed from pkgs/desktops/kde-4.4/extragear/filelight/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/misc/krusader/default.nix (renamed from pkgs/desktops/kde-4.4/extragear/krusader/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/misc/krusader/krusader-gcc44.patch (renamed from pkgs/desktops/kde-4.4/extragear/krusader/krusader-gcc44.patch) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/konq-plugins/default.nix (renamed from pkgs/desktops/kde-4.4/extragear/konq-plugins/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/version-management/kdesvn/builder.sh (renamed from pkgs/desktops/kde-4.4/extragear/kdesvn/builder.sh) | 0 | ||||
-rw-r--r-- | pkgs/applications/version-management/kdesvn/default.nix (renamed from pkgs/desktops/kde-4.4/extragear/kdesvn/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/video/kdenlive/default.nix (renamed from pkgs/desktops/kde-4.4/extragear/kdenlive/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/video/kmplayer/builder.sh (renamed from pkgs/desktops/kde-4.4/extragear/kmplayer/builder.sh) | 0 | ||||
-rw-r--r-- | pkgs/applications/video/kmplayer/default.nix (renamed from pkgs/desktops/kde-4.4/extragear/kmplayer/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.4/default.nix | 55 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.4/extragear/gtk-qt-engine/builder.sh | 11 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.4/extragear/gtk-qt-engine/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/text/kdiff3/default.nix (renamed from pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
14 files changed, 14 insertions, 77 deletions
diff --git a/pkgs/desktops/kde-4.4/extragear/filelight/default.nix b/pkgs/applications/misc/filelight/default.nix index c91fb13c8623..c91fb13c8623 100644 --- a/pkgs/desktops/kde-4.4/extragear/filelight/default.nix +++ b/pkgs/applications/misc/filelight/default.nix diff --git a/pkgs/desktops/kde-4.4/extragear/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index 9e9c04acab29..9e9c04acab29 100644 --- a/pkgs/desktops/kde-4.4/extragear/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix diff --git a/pkgs/desktops/kde-4.4/extragear/krusader/krusader-gcc44.patch b/pkgs/applications/misc/krusader/krusader-gcc44.patch index f8840d5f33c6..f8840d5f33c6 100644 --- a/pkgs/desktops/kde-4.4/extragear/krusader/krusader-gcc44.patch +++ b/pkgs/applications/misc/krusader/krusader-gcc44.patch diff --git a/pkgs/desktops/kde-4.4/extragear/konq-plugins/default.nix b/pkgs/applications/networking/browsers/konq-plugins/default.nix index 7b2a585e4653..7b2a585e4653 100644 --- a/pkgs/desktops/kde-4.4/extragear/konq-plugins/default.nix +++ b/pkgs/applications/networking/browsers/konq-plugins/default.nix diff --git a/pkgs/desktops/kde-4.4/extragear/kdesvn/builder.sh b/pkgs/applications/version-management/kdesvn/builder.sh index ed3b06c00c80..ed3b06c00c80 100644 --- a/pkgs/desktops/kde-4.4/extragear/kdesvn/builder.sh +++ b/pkgs/applications/version-management/kdesvn/builder.sh diff --git a/pkgs/desktops/kde-4.4/extragear/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index 141bf938e3a2..141bf938e3a2 100644 --- a/pkgs/desktops/kde-4.4/extragear/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix diff --git a/pkgs/desktops/kde-4.4/extragear/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index 8af0db2fcc88..8af0db2fcc88 100644 --- a/pkgs/desktops/kde-4.4/extragear/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix diff --git a/pkgs/desktops/kde-4.4/extragear/kmplayer/builder.sh b/pkgs/applications/video/kmplayer/builder.sh index 92c7515c9a90..92c7515c9a90 100644 --- a/pkgs/desktops/kde-4.4/extragear/kmplayer/builder.sh +++ b/pkgs/applications/video/kmplayer/builder.sh diff --git a/pkgs/desktops/kde-4.4/extragear/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 51ae56cc8e4e..51ae56cc8e4e 100644 --- a/pkgs/desktops/kde-4.4/extragear/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 1f346c994037..9e64b0b7c5fd 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -216,55 +216,6 @@ pkgs.recurseIntoAttrs (rec { #### EXTRA GEAR - filelight = import ./extragear/filelight { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl; - inherit kdelibs kdebase_workspace; - inherit automoc4 phonon qimageblitz; - }; - - kdenlive = import ./extragear/kdenlive { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl mlt gettext shared_mime_info; - inherit kdelibs soprano; - inherit automoc4 phonon; - }; - - kdesvn = import ./extragear/kdesvn { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext apr aprutil subversion db4; - inherit kdelibs; - inherit automoc4 phonon; - }; - - kdiff3 = import ./extragear/kdiff3 { - inherit (pkgs) stdenv fetchurl cmake qt4 gettext perl; - inherit kdelibs kdebase; - inherit automoc4 phonon; - }; - - kmplayer = import ./extragear/kmplayer { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext dbus_glib; - inherit (pkgs.gtkLibs) pango gtk; - inherit kdelibs; - inherit automoc4 phonon; - }; - - krusader = import ./extragear/krusader { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext; - inherit kdelibs; - inherit automoc4 phonon; - }; - - inherit (pkgs) konversation yakuake ktorrent koffice amarok kdevplatform - kdevelop kipi_plugins digikam; - - gtk_qt_engine = import ./extragear/gtk-qt-engine { - inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext; - inherit (pkgs.xlibs) libX11; - inherit (pkgs.gtkLibs) gtk; - inherit (pkgs.gnome) libbonoboui; - inherit kdelibs; - inherit automoc4 phonon; - }; - k3b = import ./extragear/k3b { inherit (pkgs) stdenv fetchurl cmake qt4 perl shared_mime_info libvorbis taglib gettext; inherit (pkgs) ffmpeg flac libsamplerate libdvdread lame libsndfile libmad; @@ -272,12 +223,6 @@ pkgs.recurseIntoAttrs (rec { inherit automoc4 phonon; }; - konqPlugins = import ./extragear/konq-plugins { - inherit (pkgs) stdenv fetchurl cmake qt4 gettext; - inherit kdelibs automoc4 phonon kdebase; - }; -### LOCALIZATION - l10n = pkgs.recurseIntoAttrs (import ./l10n { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext; inherit kdelibs; diff --git a/pkgs/desktops/kde-4.4/extragear/gtk-qt-engine/builder.sh b/pkgs/desktops/kde-4.4/extragear/gtk-qt-engine/builder.sh deleted file mode 100644 index 259263ca27b3..000000000000 --- a/pkgs/desktops/kde-4.4/extragear/gtk-qt-engine/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -cmakeFlags="-DINSTALL_PATH_GTK_ENGINES=$out/lib/gtk-2.0/2.10.0/engines -DINSTALL_PATH_GTK_THEMES=$out/share/themes -DINSTALL_PATH_KCONTROL_MODULES=$out/lib"; - -myPatchPhase() -{ - sed -i -e "s|\${KDE4_INCLUDE_DIR}|\${KDE4_INCLUDE_DIR} ../build/kcm_gtk|" kcm_gtk/CMakeLists.txt - sed -i -e "s|\*.po|../../\*.po|" po/CMakeLists.txt -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.4/extragear/gtk-qt-engine/default.nix b/pkgs/desktops/kde-4.4/extragear/gtk-qt-engine/default.nix deleted file mode 100644 index 8a572ba39fb7..000000000000 --- a/pkgs/desktops/kde-4.4/extragear/gtk-qt-engine/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, libX11, gtk, libbonoboui, gettext, kdelibs, automoc4, phonon}: - -stdenv.mkDerivation { - name = "gtk-qt-engine-1.1"; - src = fetchurl { - url = http://gtk-qt-engine.googlecode.com/files/gtk-qt-engine-1.1.tar.bz2; - sha256 = "4310f8f179c5ab70cea614a07b0c3e84234d05388dded85596200fa754c290a6"; - }; - buildInputs = [ cmake qt4 perl libX11 gtk libbonoboui gettext kdelibs automoc4 phonon ]; - builder = ./builder.sh; -} diff --git a/pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 1a313ca215be..1a313ca215be 100644 --- a/pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76a2b9292052..125139f95b66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -777,6 +777,8 @@ let jwhois = callPackage ../tools/networking/jwhois { }; + kdiff3 = newScope pkgs.kde4 ../tools/text/kdiff3 { }; + keychain = callPackage ../tools/misc/keychain { }; kismet = callPackage ../applications/networking/sniffers/kismet { }; @@ -5550,6 +5552,8 @@ let feh = callPackage ../applications/graphics/feh { }; + filelight = newScope pkgs.kde4 ../applications/misc/filelight { }; + firefox = firefox36Pkgs.firefox; firefoxWrapper = firefox36Wrapper; @@ -5795,6 +5799,10 @@ let kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { }; + kdenlive = newScope pkgs.kde4 ../applications/video/kdenlive { }; + + kdesvn = newScope pkgs.kde4 ../applications/version-management/kdesvn { }; + kdevelop = newScope pkgs.kde4 ../applications/editors/kdevelop { }; kermit = callPackage ../tools/misc/kermit { }; @@ -5809,12 +5817,18 @@ let kipi_plugins = newScope pkgs.kde4 ../applications/graphics/kipi-plugins { }; + kmplayer = newScope pkgs.kde4 ../applications/video/kmplayer { }; + koffice = newScope pkgs.kde4 ../applications/office/koffice { }; + konq_plugins = newScope pkgs.kde4 ../applications/networking/browsers/konq-plugins { }; + konversation = newScope pkgs.kde4 ../applications/networking/irc/konversation { }; krename = newScope pkgs.kde4 ../applications/misc/krename { }; + krusader = newScope pkgs.kde4 ../applications/misc/krusader { }; + ktorrent = newScope pkgs.kde4 ../applications/networking/ktorrent { }; lame = callPackage ../applications/audio/lame { }; |