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

svn path=/nixpkgs/trunk/; revision=8993
This commit is contained in:
Yury G. Kudryashov 2007-07-17 19:29:53 +00:00
parent 09d1b78f21
commit 4b33c46279
6 changed files with 54 additions and 2 deletions

View File

@ -0,0 +1,17 @@
{stdenv, fetchurl, python, perl, ncurses, x11, zlib, openssl}:
stdenv.mkDerivation {
name = "elinks-0.11.3";
src = fetchurl {
url = http://elinks.or.cz/download/elinks-0.11.3.tar.bz2;
sha256 = "c10e657fbd884eae4f01b91b32407bbfcbcae0ad5017fb24ea365aebc71d2af1";
};
buildInputs = [ python perl ncurses x11 zlib openssl ];
configureFlags = "--with-perl --with-python";
meta = {
description = "Full-Featured Text WWW Browser";
homepage = http://elinks.or.cz;
};
}

View File

@ -0,0 +1,16 @@
{ stdenv, fetchurl, x11, lua, gettext, groff }:
stdenv.mkDerivation {
name = "ion-3rc-20070608";
meta = {
description = "Ion is a tiling tabbed window manager designed with keyboard users in mind.";
homepage = http://modeemi.fi/~tuomov/ion;
};
src = fetchurl {
url = ftp://ftp.chg.ru/pub/Linux/gentoo/distfiles/ion-3rc-20070608.tar.gz;
sha256 = "1s46vbm74vjdjmnz8dczk9km8lhwnw63mziwb2ymib63c6gxifhy";
};
buildInputs = [ x11 lua gettext groff ];
buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}";
installFlags = "PREFIX=\${out}";
}

View File

@ -0,0 +1,9 @@
source $stdenv/setup
ensureDir $out/nix-support
substitute "$hook" "$out/nix-support/setup-hook" --subst-var out
# !!! TODO: -system-libmng
configureFlags="-prefix $out $configureFlags"
genericBuild

View File

@ -29,6 +29,7 @@ assert freetypeSupport -> fontconfig != null && freetype != null;
stdenv.mkDerivation {
name = "qt-4.3.0";
builder = ./builder.sh;
hook = ./setup-hook.sh;
src = fetchurl {
url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.3.0.tar.gz;
@ -56,7 +57,6 @@ stdenv.mkDerivation {
${if xfixesSupport then "-xfixes" else "-no-xfixes"}
${if freetypeSupport then "-fontconfig -I${freetype}/include/freetype2" else "-no-fontconfig"}
";
preConfigure="export configureFlags=\"\$configureFlags -prefix \$out\"";
passthru = {inherit mysqlSupport;};
}

0
pkgs/development/libraries/qt-4/setup-hook.sh Executable file → Normal file
View File

View File

@ -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;
};