From cc87e863869b1792b6148b8b803e8480e5457c49 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 6 Nov 2003 15:24:19 +0000 Subject: [PATCH] * Converted more packages. svn path=/nixpkgs/trunk/; revision=488 --- pkgs-ng/README | 12 +- .../networking/newsreaders/pan/builder.sh | 10 ++ .../networking/newsreaders/pan/default.fix | 26 ++++ .../version-management/subversion/default.fix | 8 +- .../libraries/fontconfig/builder.sh | 18 +++ .../libraries/fontconfig/default.fix | 21 +++ .../development/libraries/freetype/builder.sh | 10 ++ .../libraries/freetype/default.fix | 10 ++ .../development/libraries/gettext/builder.sh | 9 ++ .../development/libraries/gettext/default.fix | 10 ++ pkgs-ng/development/libraries/gnet/builder.sh | 10 ++ .../development/libraries/gnet/default.fix | 16 +++ .../development/libraries/gtk+/atk/builder.sh | 10 ++ .../libraries/gtk+/atk/default.fix | 17 +++ .../libraries/gtk+/glib/builder.sh | 10 ++ .../libraries/gtk+/glib/default.fix | 17 +++ .../libraries/gtk+/gtk+/builder.sh | 13 ++ .../libraries/gtk+/gtk+/default.fix | 30 ++++ .../libraries/gtk+/pango/builder.sh | 12 ++ .../libraries/gtk+/pango/default.fix | 20 +++ .../development/libraries/libjpeg/builder.sh | 15 ++ .../development/libraries/libjpeg/default.fix | 10 ++ .../development/libraries/libpng/builder.sh | 16 +++ .../development/libraries/libpng/default.fix | 15 ++ .../development/libraries/libtiff/builder.sh | 16 +++ .../development/libraries/libtiff/default.fix | 16 +++ .../development/libraries/libxml2/builder.sh | 11 ++ .../development/libraries/libxml2/default.fix | 15 ++ .../libraries/{Xft => xft}/builder.sh | 2 + .../libraries/{Xft => xft}/default.fix | 0 pkgs-ng/development/libraries/zlib/builder.sh | 10 ++ .../development/libraries/zlib/default.fix | 10 ++ .../tools/misc/pkgconfig/builder.sh | 10 ++ .../tools/misc/pkgconfig/default.fix | 10 ++ pkgs-ng/servers/x11/xfree86/default.fix | 3 + pkgs-ng/system/all-packages-generic.fix | 131 +++++++++++++++++- pkgs-ng/system/user-environment.fix | 3 +- pkgs-ng/tools/text/ed/builder.sh | 9 ++ pkgs-ng/tools/text/ed/default.fix | 10 ++ 39 files changed, 589 insertions(+), 12 deletions(-) create mode 100755 pkgs-ng/applications/networking/newsreaders/pan/builder.sh create mode 100644 pkgs-ng/applications/networking/newsreaders/pan/default.fix create mode 100755 pkgs-ng/development/libraries/fontconfig/builder.sh create mode 100644 pkgs-ng/development/libraries/fontconfig/default.fix create mode 100755 pkgs-ng/development/libraries/freetype/builder.sh create mode 100644 pkgs-ng/development/libraries/freetype/default.fix create mode 100755 pkgs-ng/development/libraries/gettext/builder.sh create mode 100644 pkgs-ng/development/libraries/gettext/default.fix create mode 100755 pkgs-ng/development/libraries/gnet/builder.sh create mode 100644 pkgs-ng/development/libraries/gnet/default.fix create mode 100755 pkgs-ng/development/libraries/gtk+/atk/builder.sh create mode 100644 pkgs-ng/development/libraries/gtk+/atk/default.fix create mode 100755 pkgs-ng/development/libraries/gtk+/glib/builder.sh create mode 100644 pkgs-ng/development/libraries/gtk+/glib/default.fix create mode 100755 pkgs-ng/development/libraries/gtk+/gtk+/builder.sh create mode 100644 pkgs-ng/development/libraries/gtk+/gtk+/default.fix create mode 100755 pkgs-ng/development/libraries/gtk+/pango/builder.sh create mode 100644 pkgs-ng/development/libraries/gtk+/pango/default.fix create mode 100755 pkgs-ng/development/libraries/libjpeg/builder.sh create mode 100644 pkgs-ng/development/libraries/libjpeg/default.fix create mode 100755 pkgs-ng/development/libraries/libpng/builder.sh create mode 100644 pkgs-ng/development/libraries/libpng/default.fix create mode 100755 pkgs-ng/development/libraries/libtiff/builder.sh create mode 100644 pkgs-ng/development/libraries/libtiff/default.fix create mode 100755 pkgs-ng/development/libraries/libxml2/builder.sh create mode 100644 pkgs-ng/development/libraries/libxml2/default.fix rename pkgs-ng/development/libraries/{Xft => xft}/builder.sh (80%) rename pkgs-ng/development/libraries/{Xft => xft}/default.fix (100%) create mode 100755 pkgs-ng/development/libraries/zlib/builder.sh create mode 100644 pkgs-ng/development/libraries/zlib/default.fix create mode 100755 pkgs-ng/development/tools/misc/pkgconfig/builder.sh create mode 100644 pkgs-ng/development/tools/misc/pkgconfig/default.fix create mode 100755 pkgs-ng/tools/text/ed/builder.sh create mode 100644 pkgs-ng/tools/text/ed/default.fix diff --git a/pkgs-ng/README b/pkgs-ng/README index 835be306568..7747953ef15 100644 --- a/pkgs-ng/README +++ b/pkgs-ng/README @@ -10,8 +10,11 @@ IF it's used to support SOFTWARE DEVELOPMENT: IF it's a LIBRARY used by other packages: - ./development/libraries - (e.g., libxml2) + IF it's directly related to GTK: + ./development/libraries/gtk+ + ELSE + ./development/libraries + (e.g., libxml2) ELSE IF it's a COMPILER: ./development/compilers (e.g., gcc) @@ -79,5 +82,10 @@ ELSE IF it's an APPLICATION: IF it's a VERSION MANAGEMENT system: ./applications/version-management + ELSE IF it's for NETWORKING: + IF it's a NEWSREADER: + ./applications/networking/newsreaders + ELSE + ./applications/networking/misc ELSE ./applications/misc diff --git a/pkgs-ng/applications/networking/newsreaders/pan/builder.sh b/pkgs-ng/applications/networking/newsreaders/pan/builder.sh new file mode 100755 index 00000000000..b2f160e155d --- /dev/null +++ b/pkgs-ng/applications/networking/newsreaders/pan/builder.sh @@ -0,0 +1,10 @@ +#! /bin/sh + +buildinputs="$pkgconfig $gtk $gtkspell $gnet $libxml2 $perl" +. $stdenv/setup || exit 1 + +tar xvfj $src || exit 1 +cd pan-* || exit 1 +./configure --prefix=$out || exit 1 +make || exit 1 +make install || exit 1 diff --git a/pkgs-ng/applications/networking/newsreaders/pan/default.fix b/pkgs-ng/applications/networking/newsreaders/pan/default.fix new file mode 100644 index 00000000000..ecb91b0cd19 --- /dev/null +++ b/pkgs-ng/applications/networking/newsreaders/pan/default.fix @@ -0,0 +1,26 @@ +{ spellChecking ? true +, stdenv, fetchurl, pkgconfig, gtk, gtkspell ? null, gnet, libxml2, perl +}: + +assert !isNull pkgconfig && !isNull gtk && !isNull gnet + && !isNull libxml2 && !isNull perl; +assert spellChecking -> !isNull gtkspell && gtk == gtkspell.gtk; +assert gtk.glib == gnet.glib; + +derivation { + name = "pan-0.14.2"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = http://pan.rebelbase.com/download/releases/0.14.2/SOURCE/pan-0.14.2.tar.bz2; + md5 = "ed3188e7059bb6d6c209ee5d46ac1852"; + }; + spellChecking = spellChecking; + stdenv = stdenv; + pkgconfig = pkgconfig; + gtk = gtk; + gtkspell = if spellChecking then gtkspell else null; + gnet = gnet; + libxml2 = libxml2; + perl = perl; +} diff --git a/pkgs-ng/applications/version-management/subversion/default.fix b/pkgs-ng/applications/version-management/subversion/default.fix index beea8722e3d..76a46511b27 100644 --- a/pkgs-ng/applications/version-management/subversion/default.fix +++ b/pkgs-ng/applications/version-management/subversion/default.fix @@ -28,9 +28,9 @@ derivation { swigBindings = swigBindings; stdenv = stdenv; - openssl = if sslSupport then openssl else ""; - httpd = if httpServer then httpd else ""; + openssl = if sslSupport then openssl else null; + httpd = if httpServer then httpd else null; expat = expat; - db4 = if localServer then db4 else ""; - swig = if swigBindings then swig else ""; + db4 = if localServer then db4 else null; + swig = if swigBindings then swig else null; } diff --git a/pkgs-ng/development/libraries/fontconfig/builder.sh b/pkgs-ng/development/libraries/fontconfig/builder.sh new file mode 100755 index 00000000000..3b705bd9eca --- /dev/null +++ b/pkgs-ng/development/libraries/fontconfig/builder.sh @@ -0,0 +1,18 @@ +#! /bin/sh + +buildinputs="$freetype $expat $x11 $ed" +. $stdenv/setup || exit 1 + +# Fontconfig generates a bad `fonts.conf' file is the timezone is not known +# (because it calls `date'). +export TZ=UTC + +tar xvfz $src || exit 1 +cd fontconfig-* || exit 1 +./configure --prefix=$out --with-confdir=$out/etc/fonts \ + --x-includes=$x11/include --x-libraries=$x11/lib \ + --with-expat-includes=$expat/include --with-expat-lib=$expat/lib || exit 1 +make || exit 1 +make install || exit 1 + +echo "$freetype" > $out/propagated-build-inputs || exit 1 diff --git a/pkgs-ng/development/libraries/fontconfig/default.fix b/pkgs-ng/development/libraries/fontconfig/default.fix new file mode 100644 index 00000000000..15944697423 --- /dev/null +++ b/pkgs-ng/development/libraries/fontconfig/default.fix @@ -0,0 +1,21 @@ +{stdenv, fetchurl, x11, freetype, expat, ed}: + +assert !isNull x11 && x11.buildClientLibs; +assert !isNull freetype; +assert !isNull expat; +assert !isNull ed; + +derivation { + name = "fontconfig-2.2.90"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = http://pdx.freedesktop.org/software/fontconfig/releases/fontconfig-2.2.90.tar.gz; + md5 = "5cb87476743be1bbf1674ed72a76ae6a"; + }; + stdenv = stdenv; + x11 = x11; + freetype = freetype; + expat = expat; + ed = ed; +} diff --git a/pkgs-ng/development/libraries/freetype/builder.sh b/pkgs-ng/development/libraries/freetype/builder.sh new file mode 100755 index 00000000000..81bd27e4882 --- /dev/null +++ b/pkgs-ng/development/libraries/freetype/builder.sh @@ -0,0 +1,10 @@ +#! /bin/sh + +. $stdenv/setup || exit 1 + +tar xvfj $src || exit 1 +cd freetype-* || exit 1 +./configure --prefix=$out || exit 1 +make || exit 1 +make install || exit 1 +strip -S $out/lib/*.a || exit 1 diff --git a/pkgs-ng/development/libraries/freetype/default.fix b/pkgs-ng/development/libraries/freetype/default.fix new file mode 100644 index 00000000000..4284979844d --- /dev/null +++ b/pkgs-ng/development/libraries/freetype/default.fix @@ -0,0 +1,10 @@ +{stdenv, fetchurl}: derivation { + name = "freetype-2.1.5"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = http://heanet.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.5.tar.bz2; + md5 = "54537b518b84d04190a1eccd393a29df"; + }; + stdenv = stdenv; +} diff --git a/pkgs-ng/development/libraries/gettext/builder.sh b/pkgs-ng/development/libraries/gettext/builder.sh new file mode 100755 index 00000000000..57f18bb3da1 --- /dev/null +++ b/pkgs-ng/development/libraries/gettext/builder.sh @@ -0,0 +1,9 @@ +#! /bin/sh + +. $stdenv/setup || exit 1 + +tar xvfz $src || exit 1 +cd gettext-* || exit 1 +./configure --prefix=$out || exit 1 +make || exit 1 +make install || exit 1 diff --git a/pkgs-ng/development/libraries/gettext/default.fix b/pkgs-ng/development/libraries/gettext/default.fix new file mode 100644 index 00000000000..d20c6f4763e --- /dev/null +++ b/pkgs-ng/development/libraries/gettext/default.fix @@ -0,0 +1,10 @@ +{stdenv, fetchurl}: derivation { + name = "gettext-0.12.1"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = ftp://ftp.nluug.nl/pub/gnu/gettext/gettext-0.12.1.tar.gz; + md5 = "5d4bddd300072315e668247e5b7d5bdb"; + }; + stdenv = stdenv; +} diff --git a/pkgs-ng/development/libraries/gnet/builder.sh b/pkgs-ng/development/libraries/gnet/builder.sh new file mode 100755 index 00000000000..220307fd8b9 --- /dev/null +++ b/pkgs-ng/development/libraries/gnet/builder.sh @@ -0,0 +1,10 @@ +#! /bin/sh + +buildinputs="$pkgconfig $glib" +. $stdenv/setup || exit 1 + +tar xvfz $src || exit 1 +cd gnet-* || exit 1 +./configure --prefix=$out || exit 1 +make || exit 1 +make install || exit 1 diff --git a/pkgs-ng/development/libraries/gnet/default.fix b/pkgs-ng/development/libraries/gnet/default.fix new file mode 100644 index 00000000000..0475dfa06ab --- /dev/null +++ b/pkgs-ng/development/libraries/gnet/default.fix @@ -0,0 +1,16 @@ +{stdenv, fetchurl, pkgconfig, glib}: + +assert !isNull pkgconfig && !isNull glib; + +derivation { + name = "gnet-2.0.4"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = http://www.gnetlibrary.org/src/gnet-2.0.4.tar.gz; + md5 = "b43e728391143214e2cfd0b835b6fd2a"; + }; + stdenv = stdenv; + pkgconfig = pkgconfig; + glib = glib; +} diff --git a/pkgs-ng/development/libraries/gtk+/atk/builder.sh b/pkgs-ng/development/libraries/gtk+/atk/builder.sh new file mode 100755 index 00000000000..212b5dbe287 --- /dev/null +++ b/pkgs-ng/development/libraries/gtk+/atk/builder.sh @@ -0,0 +1,10 @@ +#! /bin/sh + +buildinputs="$pkgconfig $perl $glib" +. $stdenv/setup || exit 1 + +tar xvfj $src || exit 1 +cd atk-* || exit 1 +./configure --prefix=$out || exit 1 +make || exit 1 +make install || exit 1 diff --git a/pkgs-ng/development/libraries/gtk+/atk/default.fix b/pkgs-ng/development/libraries/gtk+/atk/default.fix new file mode 100644 index 00000000000..8db047f9c49 --- /dev/null +++ b/pkgs-ng/development/libraries/gtk+/atk/default.fix @@ -0,0 +1,17 @@ +{stdenv, fetchurl, pkgconfig, glib, perl}: + +assert !isNull pkgconfig && !isNull glib && !isNull perl; + +derivation { + name = "atk-1.2.4"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.4.tar.bz2; + md5 = "2d6d50df31abe0e8892b5d3e7676a02d"; + }; + stdenv = stdenv; + pkgconfig = pkgconfig; + glib = glib; + perl = perl; +} diff --git a/pkgs-ng/development/libraries/gtk+/glib/builder.sh b/pkgs-ng/development/libraries/gtk+/glib/builder.sh new file mode 100755 index 00000000000..8f4c0b097b2 --- /dev/null +++ b/pkgs-ng/development/libraries/gtk+/glib/builder.sh @@ -0,0 +1,10 @@ +#! /bin/sh + +buildinputs="$pkgconfig $gettext $perl" +. $stdenv/setup || exit 1 + +tar xvfj $src || exit 1 +cd glib-* || exit 1 +./configure --prefix=$out || exit 1 +make || exit 1 +make install || exit 1 diff --git a/pkgs-ng/development/libraries/gtk+/glib/default.fix b/pkgs-ng/development/libraries/gtk+/glib/default.fix new file mode 100644 index 00000000000..227aa80f17d --- /dev/null +++ b/pkgs-ng/development/libraries/gtk+/glib/default.fix @@ -0,0 +1,17 @@ +{stdenv, fetchurl, pkgconfig, gettext, perl}: + +assert !isNull pkgconfig && !isNull gettext && !isNull perl; + +derivation { + name = "glib-2.2.3"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.3.tar.bz2; + md5 = "aa214a10d873b68ddd67cd9de2ccae55"; + }; + stdenv = stdenv; + pkgconfig = pkgconfig; + gettext = gettext; + perl = perl; +} diff --git a/pkgs-ng/development/libraries/gtk+/gtk+/builder.sh b/pkgs-ng/development/libraries/gtk+/gtk+/builder.sh new file mode 100755 index 00000000000..9aac8713783 --- /dev/null +++ b/pkgs-ng/development/libraries/gtk+/gtk+/builder.sh @@ -0,0 +1,13 @@ +#! /bin/sh + +buildinputs="$pkgconfig $x11 $glib $atk $pango $perl $libtiff $libjpeg $libpng" +. $stdenv/setup || exit 1 + +tar xvfj $src || exit 1 +cd gtk+-* || exit 1 +./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib \ + --with-libtiff=$tiff || exit 1 +make || exit 1 +make install || exit 1 + +echo "$x11 $glib $atk $pango" > $out/propagated-build-inputs || exit 1 diff --git a/pkgs-ng/development/libraries/gtk+/gtk+/default.fix b/pkgs-ng/development/libraries/gtk+/gtk+/default.fix new file mode 100644 index 00000000000..f0fe5979d0b --- /dev/null +++ b/pkgs-ng/development/libraries/gtk+/gtk+/default.fix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, x11, glib, atk +, pango, perl, libtiff, libjpeg, libpng}: + +assert !isNull pkgconfig && !isNull x11 && !isNull glib && !isNull atk + && !isNull pango && !isNull perl && !isNull perl && !isNull libtiff + && !isNull libjpeg && !isNull libpng; +assert x11.buildClientLibs; +assert glib == atk.glib; +assert glib == pango.glib; +assert x11 == pango.x11; + +derivation { + name = "gtk+-2.2.4"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.4.tar.bz2; + md5 = "605332199533e73bc6eec481fb4f1671"; + }; + stdenv = stdenv; + pkgconfig = pkgconfig; + x11 = x11; + glib = glib; + atk = atk; + pango = pango; + perl = perl; + libtiff = libtiff; + libjpeg = libjpeg; + libpng = libpng; +} diff --git a/pkgs-ng/development/libraries/gtk+/pango/builder.sh b/pkgs-ng/development/libraries/gtk+/pango/builder.sh new file mode 100755 index 00000000000..daa6001cc17 --- /dev/null +++ b/pkgs-ng/development/libraries/gtk+/pango/builder.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +buildinputs="$pkgconfig $x11 $glib $xft" +. $stdenv/setup || exit 1 + +tar xvfj $src || exit 1 +cd pango-* || exit 1 +./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1 +make || exit 1 +make install || exit 1 + +echo "$xft" > $out/propagated-build-inputs || exit 1 diff --git a/pkgs-ng/development/libraries/gtk+/pango/default.fix b/pkgs-ng/development/libraries/gtk+/pango/default.fix new file mode 100644 index 00000000000..d598d97f9c3 --- /dev/null +++ b/pkgs-ng/development/libraries/gtk+/pango/default.fix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, pkgconfig, x11, glib, xft}: + +assert !isNull pkgconfig && !isNull x11 && !isNull glib && !isNull xft; +assert x11.buildClientLibs; +assert xft.x11 == x11; + +derivation { + name = "pango-1.2.5"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.5.tar.bz2; + md5 = "df00fe3e71cd297010f24f439b6c8ee6"; + }; + stdenv = stdenv; + pkgconfig = pkgconfig; + x11 = x11; + glib = glib; + xft = xft; +} diff --git a/pkgs-ng/development/libraries/libjpeg/builder.sh b/pkgs-ng/development/libraries/libjpeg/builder.sh new file mode 100755 index 00000000000..9a27a8545c4 --- /dev/null +++ b/pkgs-ng/development/libraries/libjpeg/builder.sh @@ -0,0 +1,15 @@ +#! /bin/sh + +. $stdenv/setup || exit 1 + +tar xvfz $src || exit 1 +cd jpeg-* || exit 1 +./configure --prefix=$out --enable-shared || exit 1 +make || exit 1 +mkdir $out || exit 1 +mkdir $out/bin || exit 1 +mkdir $out/lib || exit 1 +mkdir $out/include || exit 1 +mkdir $out/man || exit 1 +mkdir $out/man/man1 || exit 1 +make install || exit 1 diff --git a/pkgs-ng/development/libraries/libjpeg/default.fix b/pkgs-ng/development/libraries/libjpeg/default.fix new file mode 100644 index 00000000000..80946833f72 --- /dev/null +++ b/pkgs-ng/development/libraries/libjpeg/default.fix @@ -0,0 +1,10 @@ +{stdenv, fetchurl}: derivation { + name = "libjpeg-6b"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = http://www.ijg.org/files/jpegsrc.v6b.tar.gz; + md5 = "dbd5f3b47ed13132f04c685d608a7547"; + }; + stdenv = stdenv; +} diff --git a/pkgs-ng/development/libraries/libpng/builder.sh b/pkgs-ng/development/libraries/libpng/builder.sh new file mode 100755 index 00000000000..d601bfa5fbf --- /dev/null +++ b/pkgs-ng/development/libraries/libpng/builder.sh @@ -0,0 +1,16 @@ +#! /bin/sh + +buildinputs="$zlib" +. $stdenv/setup || exit 1 + +tar xvfj $src || exit 1 +cd libpng-* || exit 1 +make -f scripts/makefile.linux || exit 1 +mkdir $out || exit 1 +mkdir $out/bin || exit 1 +mkdir $out/lib || exit 1 +mkdir $out/include || exit 1 +make -f scripts/makefile.linux install prefix=$out || exit 1 +strip -S $out/lib/*.a || exit 1 + +echo "$zlib" > $out/propagated-build-inputs || exit 1 diff --git a/pkgs-ng/development/libraries/libpng/default.fix b/pkgs-ng/development/libraries/libpng/default.fix new file mode 100644 index 00000000000..47322de7d17 --- /dev/null +++ b/pkgs-ng/development/libraries/libpng/default.fix @@ -0,0 +1,15 @@ +{stdenv, fetchurl, zlib}: + +assert !isNull zlib; + +derivation { + name = "libpng-1.2.5"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = http://heanet.dl.sourceforge.net/sourceforge/png-mng/libpng-1.2.5.tar.bz2; + md5 = "3fc28af730f12ace49b14568de4ad934"; + }; + stdenv = stdenv; + zlib = zlib; +} diff --git a/pkgs-ng/development/libraries/libtiff/builder.sh b/pkgs-ng/development/libraries/libtiff/builder.sh new file mode 100755 index 00000000000..c237077c8b4 --- /dev/null +++ b/pkgs-ng/development/libraries/libtiff/builder.sh @@ -0,0 +1,16 @@ +#! /bin/sh + +buildinputs="$zlib $libjpeg" +. $stdenv/setup || exit 1 + +tar xvfz $src || exit 1 +cd tiff-* || exit 1 +./configure --prefix=$out --with-DIR_MAN=$out/man \ + --with-ZIP --with-JPEG \ + --with-DIRS_LIBINC="$zlib/include $libjpeg/include" || exit 1 +make || exit 1 +mkdir $out || exit 1 +make install || exit 1 +strip -S $out/lib/*.a || exit 1 + +echo "$zlib $libjpeg" > $out/propagated-build-inputs || exit 1 diff --git a/pkgs-ng/development/libraries/libtiff/default.fix b/pkgs-ng/development/libraries/libtiff/default.fix new file mode 100644 index 00000000000..7a14a63ce33 --- /dev/null +++ b/pkgs-ng/development/libraries/libtiff/default.fix @@ -0,0 +1,16 @@ +{stdenv, fetchurl, zlib, libjpeg}: + +assert !isNull zlib && !isNull libjpeg; + +derivation { + name = "libtiff-3.5.7"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = ftp://ftp.remotesensing.org/pub/libtiff/tiff-v3.5.7.tar.gz; + md5 = "82243b5ae9b7c9e492aeebc501680990"; + }; + stdenv = stdenv; + zlib = zlib; + libjpeg = libjpeg; +} diff --git a/pkgs-ng/development/libraries/libxml2/builder.sh b/pkgs-ng/development/libraries/libxml2/builder.sh new file mode 100755 index 00000000000..1b4e58174c8 --- /dev/null +++ b/pkgs-ng/development/libraries/libxml2/builder.sh @@ -0,0 +1,11 @@ +#! /bin/sh + +buildinputs="$zlib" +. $stdenv/setup || exit 1 + +tar xvfz $src || exit 1 +cd libxml2-* || exit 1 +./configure --prefix=$out || exit 1 +make || exit 1 +make install || exit 1 +strip -S $out/lib/*.a || exit 1 diff --git a/pkgs-ng/development/libraries/libxml2/default.fix b/pkgs-ng/development/libraries/libxml2/default.fix new file mode 100644 index 00000000000..3e2fb8b13e5 --- /dev/null +++ b/pkgs-ng/development/libraries/libxml2/default.fix @@ -0,0 +1,15 @@ +{stdenv, fetchurl, zlib}: + +assert !isNull zlib; + +derivation { + name = "libxml2-2.6.2"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = http://rpmfind.net/pub/libxml/libxml2-2.6.2.tar.gz; + md5 = "56e7f74d3d44cc16790ad08624faef64"; + }; + stdenv = stdenv; + zlib = zlib; +} diff --git a/pkgs-ng/development/libraries/Xft/builder.sh b/pkgs-ng/development/libraries/xft/builder.sh similarity index 80% rename from pkgs-ng/development/libraries/Xft/builder.sh rename to pkgs-ng/development/libraries/xft/builder.sh index 79a570d46cc..f4432e079bf 100755 --- a/pkgs-ng/development/libraries/Xft/builder.sh +++ b/pkgs-ng/development/libraries/xft/builder.sh @@ -8,3 +8,5 @@ cd xft-* || exit 1 ./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1 make || exit 1 make install || exit 1 + +echo "$fontconfig" > $out/propagated-build-inputs || exit 1 diff --git a/pkgs-ng/development/libraries/Xft/default.fix b/pkgs-ng/development/libraries/xft/default.fix similarity index 100% rename from pkgs-ng/development/libraries/Xft/default.fix rename to pkgs-ng/development/libraries/xft/default.fix diff --git a/pkgs-ng/development/libraries/zlib/builder.sh b/pkgs-ng/development/libraries/zlib/builder.sh new file mode 100755 index 00000000000..4ca1a830544 --- /dev/null +++ b/pkgs-ng/development/libraries/zlib/builder.sh @@ -0,0 +1,10 @@ +#! /bin/sh + +. $stdenv/setup || exit 1 + +tar xvfz $src || exit 1 +cd zlib-* || exit 1 +./configure --prefix=$out --shared || exit 1 +make || exit 1 +mkdir $out || exit 1 +make install || exit 1 diff --git a/pkgs-ng/development/libraries/zlib/default.fix b/pkgs-ng/development/libraries/zlib/default.fix new file mode 100644 index 00000000000..7dfe3e6a9ab --- /dev/null +++ b/pkgs-ng/development/libraries/zlib/default.fix @@ -0,0 +1,10 @@ +{stdenv, fetchurl}: derivation { + name = "zlib-1.1.4"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = http://www.gzip.org/zlib/zlib-1.1.4.tar.gz; + md5 = "abc405d0bdd3ee22782d7aa20e440f08"; + }; + stdenv = stdenv; +} diff --git a/pkgs-ng/development/tools/misc/pkgconfig/builder.sh b/pkgs-ng/development/tools/misc/pkgconfig/builder.sh new file mode 100755 index 00000000000..5ec940cb03a --- /dev/null +++ b/pkgs-ng/development/tools/misc/pkgconfig/builder.sh @@ -0,0 +1,10 @@ +#! /bin/sh + +. $stdenv/setup || exit 1 + +tar xvfz $src || exit 1 +cd pkgconfig-* || exit 1 +./configure --prefix=$out || exit 1 +make || exit 1 +mkdir $out || exit 1 +make install || exit 1 diff --git a/pkgs-ng/development/tools/misc/pkgconfig/default.fix b/pkgs-ng/development/tools/misc/pkgconfig/default.fix new file mode 100644 index 00000000000..9194b041843 --- /dev/null +++ b/pkgs-ng/development/tools/misc/pkgconfig/default.fix @@ -0,0 +1,10 @@ +{stdenv, fetchurl}: derivation { + name = "pkgconfig-0.15.0"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz; + md5 = "a7e4f60a6657dbc434334deb594cc242"; + }; + stdenv = stdenv; +} diff --git a/pkgs-ng/servers/x11/xfree86/default.fix b/pkgs-ng/servers/x11/xfree86/default.fix index c02ffcb8428..17971c2081f 100644 --- a/pkgs-ng/servers/x11/xfree86/default.fix +++ b/pkgs-ng/servers/x11/xfree86/default.fix @@ -25,6 +25,9 @@ derivation { md5 = "b82a0443e1b7bf860e4343e6b6766cb6"; }; + buildServer = buildServer; + buildClientLibs = buildClientLibs; + stdenv = stdenv; bison = bison; flex = flex; diff --git a/pkgs-ng/system/all-packages-generic.fix b/pkgs-ng/system/all-packages-generic.fix index 8aa98651ae3..7cba70c2c3f 100644 --- a/pkgs-ng/system/all-packages-generic.fix +++ b/pkgs-ng/system/all-packages-generic.fix @@ -44,6 +44,11 @@ stdenv = stdenv; }; + ed = (import ../tools/text/ed) { + fetchurl = fetchurl; + stdenv = stdenv; + }; + gnutar = (import ../tools/archivers/gnutar) { fetchurl = fetchurl; stdenv = stdenv; @@ -80,12 +85,17 @@ stdenv = stdenv; }; - gnumake = (import ../development/tools/build-managers/gnumake) { + gnum4 = (import ../development/tools/misc/gnum4) { fetchurl = fetchurl; stdenv = stdenv; }; - gnum4 = (import ../development/tools/misc/gnum4) { + pkgconfig = (import ../development/tools/misc/pkgconfig) { + fetchurl = fetchurl; + stdenv = stdenv; + }; + + gnumake = (import ../development/tools/build-managers/gnumake) { fetchurl = fetchurl; stdenv = stdenv; }; @@ -134,6 +144,17 @@ stdenv = stdenv; }; + libxml2 = (import ../development/libraries/libxml2) { + fetchurl = fetchurl; + stdenv = stdenv; + zlib = zlib; + }; + + gettext = (import ../development/libraries/gettext) { + fetchurl = fetchurl; + stdenv = stdenv; + }; + db4 = (import ../development/libraries/db4) { fetchurl = fetchurl; stdenv = stdenv; @@ -145,6 +166,97 @@ perl = perl; }; + freetype = (import ../development/libraries/freetype) { + fetchurl = fetchurl; + stdenv = stdenv; + }; + + fontconfig = (import ../development/libraries/fontconfig) { + fetchurl = fetchurl; + stdenv = stdenv; + x11 = xfree86; + freetype = freetype; + expat = expat; + ed = ed; + }; + + xft = (import ../development/libraries/xft) { + fetchurl = fetchurl; + stdenv = stdenv; + pkgconfig = pkgconfig; + x11 = xfree86; + fontconfig = fontconfig; + }; + + zlib = (import ../development/libraries/zlib) { + fetchurl = fetchurl; + stdenv = stdenv; + }; + + libjpeg = (import ../development/libraries/libjpeg) { + fetchurl = fetchurl; + stdenv = stdenv; + }; + + libtiff = (import ../development/libraries/libtiff) { + fetchurl = fetchurl; + stdenv = stdenv; + zlib = zlib; + libjpeg = libjpeg; + }; + + libpng = (import ../development/libraries/libpng) { + fetchurl = fetchurl; + stdenv = stdenv; + zlib = zlib; + }; + + glib = (import ../development/libraries/gtk+/glib) { + fetchurl = fetchurl; + stdenv = stdenv; + pkgconfig = pkgconfig; + gettext = gettext; + perl = perl; + }; + + atk = (import ../development/libraries/gtk+/atk) { + fetchurl = fetchurl; + stdenv = stdenv; + pkgconfig = pkgconfig; + glib = glib; + perl = perl; + }; + + pango = (import ../development/libraries/gtk+/pango) { + fetchurl = fetchurl; + stdenv = stdenv; + pkgconfig = pkgconfig; + x11 = xfree86; + glib = glib; + xft = xft; + }; + + gtk = (import ../development/libraries/gtk+/gtk+) { + fetchurl = fetchurl; + stdenv = stdenv; + pkgconfig = pkgconfig; + x11 = xfree86; + glib = glib; + atk = atk; + pango = pango; + perl = perl; + libtiff = libtiff; + libjpeg = libjpeg; + libpng = libpng; + }; + + gnet = (import ../development/libraries/gnet) { + fetchurl = fetchurl; + stdenv = stdenv; + pkgconfig = pkgconfig; + glib = glib; + }; + ### SERVERS @@ -180,16 +292,27 @@ ### APPLICATIONS subversion = (import ../applications/version-management/subversion) { - fetchurl = fetchurl; - stdenv = stdenv; localServer = true; httpServer = false; sslSupport = true; swigBindings = false; + fetchurl = fetchurl; + stdenv = stdenv; openssl = openssl; httpd = apacheHttpd; db4 = db4; expat = expat; }; + pan = (import ../applications/networking/newsreaders/pan) { + spellChecking = false; + fetchurl = fetchurl; + stdenv = stdenv; + pkgconfig = pkgconfig; + gtk = gtk; + gnet = gnet; + libxml2 = libxml2; + perl = perl; + }; + } diff --git a/pkgs-ng/system/user-environment.fix b/pkgs-ng/system/user-environment.fix index 735318f9406..ef3849a0348 100644 --- a/pkgs-ng/system/user-environment.fix +++ b/pkgs-ng/system/user-environment.fix @@ -11,9 +11,8 @@ # This list should be generated automatically by a package # management user interface. selectedPkgs = [ - pkgs.aterm pkgs.subversion - pkgs.xfree86 + pkgs.pan ]; # Create a user environment. diff --git a/pkgs-ng/tools/text/ed/builder.sh b/pkgs-ng/tools/text/ed/builder.sh new file mode 100755 index 00000000000..ba63de01c95 --- /dev/null +++ b/pkgs-ng/tools/text/ed/builder.sh @@ -0,0 +1,9 @@ +#! /bin/sh + +. $stdenv/setup || exit 1 + +tar xvfz $src || exit 1 +cd ed-* || exit 1 +./configure --prefix=$out || exit 1 +make || exit 1 +make install || exit 1 diff --git a/pkgs-ng/tools/text/ed/default.fix b/pkgs-ng/tools/text/ed/default.fix new file mode 100644 index 00000000000..1f79383e058 --- /dev/null +++ b/pkgs-ng/tools/text/ed/default.fix @@ -0,0 +1,10 @@ +{stdenv, fetchurl}: derivation { + name = "ed-0.2"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = ftp://ftp.gnu.org/pub/gnu/ed/ed-0.2.tar.gz; + md5 = "ddd57463774cae9b50e70cd51221281b"; + }; + stdenv = stdenv; +}