* ion-3 and elinks added, missprint in qt-4 corrected

svn path=/nixpkgs/trunk/; revision=8993

1 files changed, 11 insertions, 1 deletions

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 906e6035a978..294d1b460ef9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1700,7 +1700,7 @@ rec {
   };
 
   # Builds, but not tested yet
-  qt4 = (import ./qt-4) {
+  qt4 = import ../development/libraries/qt-4 {
     inherit fetchurl stdenv zlib libjpeg libpng which mysql mesa openssl cups dbus fontconfig freetype pkgconfig;
     inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
       libXmu libXinerama xineramaproto libXcursor libICE libSM libX11 libXext inputproto fixesproto libXfixes;
@@ -2818,6 +2818,11 @@ rec {
 
   eclipseSpoofax = lowPrio (appendToName "with-spoofax" (eclipse [spoofax]));
 
+  elinks = (import ../applications/networking/browsers/elinks)
+  {
+    inherit stdenv fetchurl python perl ncurses x11 zlib openssl;
+  };
+
   emacs = import ../applications/editors/emacs {
     inherit fetchurl stdenv ncurses x11 Xaw3d;
     inherit (xlibs) libXaw libXpm;
@@ -2947,6 +2952,11 @@ rec {
     inherit (xlibs) libXft;
   };
 
+  ion3 = import ../applications/window-managers/ion-3 {
+	  inherit fetchurl stdenv x11 gettext groff;
+	  lua = lua5;
+  };
+
   joe = import ../applications/editors/joe {
     inherit stdenv fetchurl;
   };