* Mark as stable.

svn path=/nixpkgs/branches/0.5.1-release/; revision=995

ChangeLog

@@ -1,12 +0,0 @@
-2003-08-18  Eelco Visser  <visser@cs.uu.nl>
-
-	* pkgs/strategoxt/pkg-build.sh: generic build script for packages
-	with the standard untar; bootstrap; configure; make; make install
-	interface.  The script is parameterized with arguments for
-	configure. That is, all arguments are passed verbatim to
-	configure.
-
-	* asfix-tools, gpp, sc, srts, stratego-front, xtc: Fix expressions
-	and (trivial) build script for basic strategoxt packages. All
-	packages are abstracted on subversion revision.
-

pkgs-ng/applications/graphics/gqview/builder.sh

@@ -1,10 +0,0 @@
-#! /bin/sh
-
-buildinputs="$pkgconfig $gtk $libpng"
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd gqview-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs-ng/applications/graphics/gqview/default.fix

@@ -1,22 +0,0 @@
-{stdenv, fetchurl, pkgconfig, gtk, libpng}:
-
-assert !isNull pkgconfig && !isNull gtk && !isNull png;
-# Note that we cannot just copy gtk's png attribute, since gtk might
-# not be linked against png.
-assert libpng == gtk.libpng;
-
-derivation {
-  name = "gqview-1.3.5";
-  system = stdenv.system;
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/gqview/gqview-1.3.5.tar.gz;
-    md5 = "c44687bdd636ea6e5133fb936abf880a";
-  };
-
-  stdenv = stdenv;
-  pkgconfig = pkgconfig;
-  gtk = gtk;
-  libpng = libpng;
-}

pkgs-ng/applications/networking/browsers/firebird/default.fix

@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL
-}:
-
-assert !isNull pkgconfig && !isNull gtk && !isNull perl
-  && !isNull zip && !isNull libIDL;
-
-assert libIDL.glib == gtk.glib;
-
-derivation {
-  name = "MozillaFirebird-0.7";
-  system = stdenv.system;
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = ftp://ftp.mozilla.org/pub/mozilla.org/firebird/releases/0.7/MozillaFirebird-source-0.7.tar.gz;
-    md5 = "35112566a3dca5bdf363972056afc462";
-  };
-
-  stdenv = stdenv;
-  pkgconfig = pkgconfig;
-  gtk = gtk;
-  perl = perl;
-  zip = zip;
-  libIDL = libIDL;
-}

pkgs-ng/applications/networking/mailreaders/sylpheed/builder.sh

@@ -1,20 +0,0 @@
-#! /bin/sh
-
-buildinputs="$gtk $gdkpixbuf $openssl"
-. $stdenv/setup || exit 1
-
-if test $sslSupport; then
-    extraflags="--enable-ssl $extraflags"
-fi
-
-if test $imageSupport; then
-    extraflags="--enable-gdk-pixbuf $extraflags"
-else
-    extraflags="--disable-gdk-pixbuf --disable-imlibtest $extraflags"
-fi    
-
-tar xvfj $src || exit 1
-cd sylpheed-* || exit 1
-./configure --prefix=$out $extraflags || exit 1
-make || exit 1
-make install || exit 1

pkgs-ng/applications/networking/mailreaders/sylpheed/default.fix

@@ -1,27 +0,0 @@
-{ sslSupport ? true
-, imageSupport ? true
-, stdenv, fetchurl, gtk, openssl ? null, gdkpixbuf ? null
-}:
-
-assert !isNull gtk;
-assert sslSupport -> !isNull openssl;
-assert imageSupport -> !isNull gdkpixbuf;
-
-derivation {
-  name = "sylpheed-0.9.7";
-  system = stdenv.system;
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://sylpheed.good-day.net/sylpheed/sylpheed-0.9.7.tar.bz2;
-    md5 = "399deb5abd52396d26d6475689a5ec3f";
-  };
-
-  sslSupport = sslSupport;
-  imageSupport = imageSupport;
-
-  stdenv = stdenv;
-  gtk = gtk;
-  openssl = if sslSupport then openssl else null;
-  gdkpixbuf = if imageSupport then gdkpixbuf else null;
-}

pkgs-ng/applications/networking/newsreaders/pan/builder.sh

@@ -1,10 +0,0 @@
-#! /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

pkgs-ng/applications/networking/newsreaders/pan/default.fix

@@ -1,29 +0,0 @@
-{ 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;
-}

pkgs-ng/applications/version-management/subversion/builder.sh

@@ -1,35 +0,0 @@
-#! /bin/sh
-
-buildinputs="$openssl $db4 $httpd $swig $expat"
-. $stdenv/setup || exit 1
-
-if test $localServer; then
-    extraflags="--with-berkeley-db=$db4 $extraflags"
-fi
-
-if test $sslSupport; then
-    extraflags="--with-ssl --with-libs=$openssl $extraflags"
-fi
-
-if test $httpServer; then
-    extraflags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $extraflags"
-    extramakeflags="APACHE_LIBEXECDIR=$out/modules $extramakeflags"
-fi
-
-if test $swigBindings; then
-    extraflags="--with-swig=$swig $extraflags"
-fi
-
-echo "extra flags: $extraflags"
-
-tar xvfz $src || exit 1
-cd subversion-* || exit 1
-./configure --prefix=$out $extraflags \
- --without-gdbm --disable-static || exit 1
-make $extramakeflags || exit 1
-make install $extramakeflags || exit 1
-
-if test $swigBindings; then
-    make swig-py || exit 1
-    make install-swig-py || exit 1
-fi

pkgs-ng/applications/version-management/subversion/default.fix

@@ -1,36 +0,0 @@
-{ localServer ? false
-, httpServer ? false
-, sslSupport ? false
-, swigBindings ? false
-, stdenv, fetchurl
-, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null
-}:
-
-assert !isNull expat;
-assert localServer -> !isNull db4;
-assert httpServer -> !isNull httpd && httpd.expat == expat;
-assert sslSupport -> !isNull openssl && (httpServer -> httpd.openssl == openssl);
-assert swigBindings -> !isNull swig;
-
-derivation {
-  name = "subversion-0.32.1";
-  system = stdenv.system;
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://svn.collab.net/tarballs/subversion-0.32.1.tar.gz;
-    md5 = "b06717a8ef50db4b5c4d380af00bd901";
-  };
-
-  localServer = localServer;
-  httpServer = httpServer;
-  sslSupport = sslSupport;
-  swigBindings = swigBindings;
-
-  stdenv = stdenv;
-  openssl = if sslSupport then openssl else null;
-  httpd = if httpServer then httpd else null;
-  expat = expat;
-  db4 = if localServer then db4 else null;
-  swig = if swigBindings then swig else null;
-}

pkgs-ng/applications/video/MPlayer/builder.sh

@@ -1,19 +0,0 @@
-#! /bin/sh
-
-buildinputs="$freetype $x11 $alsa"
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-tar xvfj $fonts || exit 1
-cd MPlayer-* || exit 1
-./configure --prefix=$out --with-win32libdir=$win32codecs \
- --with-x11incdir=$x11/include --with-x11libdir=$x11/lib \
- --with-reallibdir=$win32codecs \
- --disable-sdl --disable-esd --disable-xanim --disable-cdparanoia --disable-directfb \
- --disable-lirc --disable-svga --disable-libdv \
- --disable-vorbis --disable-png --disable-jpeg --disable-gif \
- --enable-runtime-cpudetection \
- || exit 1
-make || exit 1
-make install || exit 1
-cp -p ../font-arial-iso-8859-1/font-arial-18-iso-8859-1/* $out/share/mplayer/font || exit 1

pkgs-ng/applications/video/MPlayer/default.fix

@@ -1,31 +0,0 @@
-{ alsaSupport ? false
-, stdenv, fetchurl, x11, freetype, alsa ? null}:
-
-assert !isNull x11 && !isNull freetype;
-assert alsaSupport -> !isNull alsa;
-
-derivation {
-  name = "MPlayer-1.0pre2";
-  system = stdenv.system;
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre2.tar.bz2;
-    md5 = "a60c179468f85e83e3f9e1922e81ad64";
-  };
-  fonts = fetchurl {
-    url = http://www2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2;
-    md5 = "1ecd31d17b51f16332b1fcc7da36b312";
-  };
-
-  alsaSupport = alsaSupport;
-
-  stdenv = stdenv;
-  x11 = x11;
-  freetype = freetype;
-  alsa = if alsaSupport then alsa else null;
-  win32codecs = (import ./win32codecs) {
-    stdenv = stdenv;
-    fetchurl = fetchurl;
-  };
-}

pkgs-ng/applications/video/MPlayer/win32codecs/builder.sh

@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-mkdir $out || exit 1
-cd $out || exit 1
-tar xvfj $src || exit 1
-mv extralite/* . || exit 1
-rmdir extralite || exit 1

pkgs-ng/applications/video/MPlayer/win32codecs/default.fix

@@ -1,10 +0,0 @@
-{stdenv, fetchurl}: derivation {
-  name = "win32codecs-1";
-  system = stdenv.system;
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/extralite.tar.bz2;
-    md5 = "4748ecae87f71e8bda9cb2e2a9bd30b4";
-  };
-  stdenv = stdenv;
-}

pkgs-ng/build-support/fetchurl/builder.sh

@@ -1,21 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup
-
-echo "downloading $url into $out..."
-
-#prefetch=@prefix@/store/nix-prefetch-url-$md5
-prefetch=/nix/store/nix-prefetch-url-$md5
-if test -f "$prefetch"; then
-    echo "using prefetched $prefetch";
-    mv $prefetch $out || exit 1
-else
-    wget --passive-ftp "$url" -O "$out" || exit 1
-fi
-
-#actual=$(@bindir@/nix-hash --flat $out)
-actual=$(/nix/bin/nix-hash --flat $out)
-if test "$actual" != "$md5"; then
-    echo "hash is $actual, expected $md5"
-    exit 1
-fi

pkgs-ng/build-support/fetchurl/default.fix

@@ -1,9 +0,0 @@
-{stdenv}: {url, md5}: derivation {
-  name = baseNameOf (toString url);
-  system = stdenv.system;
-  builder = ./builder.sh;
-  stdenv = stdenv;
-  url = url;
-  md5 = md5;
-  id = md5;
-}

pkgs-ng/development/compilers/gcc/builder.sh

@@ -1,56 +0,0 @@
-#! /bin/sh
-
-buildinputs="$binutils"
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-
-if test "$noSysDirs" == "1"; then
-    # Disable the standard include directories.
-    cd gcc-* || exit 1
-    cat >> ./gcc/cppdefault.h <<EOF
-#undef LOCAL_INCLUDE_DIR
-#undef SYSTEM_INCLUDE_DIR
-#undef STANDARD_INCLUDE_DIR
-EOF
-    cd .. || exit 1
-fi
-
-# Configure.
-mkdir build || exit 1
-cd build || exit 1
-../gcc-*/configure --prefix=$out --enable-languages=c,c++ || exit 1
-
-if test "$noSysDirs" == "1"; then
-    # Patch some of the makefiles to force linking against our own glibc.
-    extraflags="-Wl,-s $NIX_CFLAGS_COMPILE $NIX_CFLAGS_LINK"
-    for i in $NIX_LDFLAGS; do
-        extraflags="$extraflags -Wl,$i"
-    done
-
-    mf=Makefile
-    sed \
-        -e "s^FLAGS_FOR_TARGET =\(.*\)^FLAGS_FOR_TARGET = \1 $extraflags^" \
-        < $mf > $mf.tmp || exit 1
-    mv $mf.tmp $mf
-
-    mf=gcc/Makefile
-    sed \
-        -e "s^X_CFLAGS =\(.*\)^X_CFLAGS = \1 $extraflags^" \
-        < $mf > $mf.tmp || exit 1
-    mv $mf.tmp $mf
-
-    # Patch gcc/Makefile to prevent fixinc.sh from "fixing" system header files
-    # from /usr/include.
-    mf=gcc/Makefile
-    sed \
-        -e "s^NATIVE_SYSTEM_HEADER_DIR =\(.*\)^NATIVE_SYSTEM_HEADER_DIR = /fixinc-disabled^" \
-        < $mf > $mf.tmp || exit 1
-    mv $mf.tmp $mf
-fi
-
-# Build and install.
-make bootstrap || exit 1
-make install || exit 1
-
-find $out -name "*.a" -exec strip -S {} \; || exit 1

pkgs-ng/development/compilers/gcc/default.fix

@@ -1,12 +0,0 @@
-{stdenv, fetchurl, binutils}: derivation {
-  name = "gcc-3.3.2";
-  system = stdenv.system;
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-3.3.2/gcc-3.3.2.tar.bz2;
-    md5 = "65999f654102f5438ac8562d13a6eced";
-  };
-  stdenv = stdenv;
-  binutils = binutils;
-  noSysDirs = stdenv.noSysDirs;
-}

pkgs-ng/development/interpreters/perl/builder.sh

@@ -1,26 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd perl-* || exit 1
-
-# Perl's Configure messes with PATH.  We can't have that, so we patch it.
-# Yeah, this is an ugly hack.
-cat Configure | \
- grep -v '^paths=' | \
- grep -v '^locincpth=' | \
- grep -v '^xlibpth=' | \
- grep -v '^glibpth=' | \
- grep -v '^loclibpth=' | \
- grep -v '^locincpth=' | \
- cat > Configure.tmp || exit 1
-mv Configure.tmp Configure || exit 1
-chmod +x Configure || exit 1
-
-./Configure -de -Dcc=gcc -Dprefix=$out -Uinstallusrbinperl \
- -Dlocincpth="$NIX_LIBC_INCLUDES" \
- -Dloclibpth="$NIX_LIBC_LIBS" \
- || exit 1
-make || exit 1
-make install || exit 1

pkgs-ng/development/interpreters/perl/default.fix

@@ -1,10 +0,0 @@
-{stdenv, fetchurl}: derivation {
-  name = "perl-5.8.0";
-  system = stdenv.system;
-  builder = ./builder.sh;
-  src = fetchurl {
-      url = ftp://ftp.cs.uu.nl/mirror/CPAN/src/5.0/perl-5.8.1.tar.gz;
-      md5 = "87cf132f1fbf23e780f0b218046438a6";
-    };
-  stdenv = stdenv;
-}

pkgs-ng/development/libraries/aterm/builder.sh

@@ -1,10 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd aterm-* || exit 1
-./configure --prefix=$out --with-gcc || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1

pkgs-ng/development/libraries/aterm/default.fix

@@ -1,10 +0,0 @@
-{stdenv, fetchurl}: derivation {
-  name = "aterm-2.0";
-  system = stdenv.system;
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz;
-    md5 = "853474e4bcf4a85f7d38a0676b36bded";
-  };
-  stdenv = stdenv;
-}

pkgs-ng/development/libraries/db4/builder.sh

@@ -1,10 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd db-*/build_unix || exit 1
-../dist/configure --prefix=$out --enable-cxx --enable-compat185 || exit 1
-make || exit 1
-make install || exit 1
-rm -rf $out/doc || exit 1

pkgs-ng/development/libraries/db4/default.fix

@@ -1,10 +0,0 @@
-{stdenv, fetchurl}: derivation {
-  name = "db4-4.0.14";
-  system = stdenv.system;
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz;
-    md5 = "12262c64fcd64b772e7cffad8e4d0ebc";
-  };
-  stdenv = stdenv;
-}

pkgs-ng/development/libraries/fontconfig/builder.sh

@@ -1,18 +0,0 @@
-#! /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

pkgs-ng/development/libraries/fontconfig/default.fix

@@ -1,21 +0,0 @@
-{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;
-}

pkgs-ng/development/libraries/freetype/builder.sh

@@ -1,10 +0,0 @@
-#! /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

pkgs-ng/development/libraries/glibc/builder.sh

@@ -1,26 +0,0 @@
-#! /bin/sh
-
-# glibc cannot have itself in its rpath.
-export NIX_NO_SELF_RPATH=1
-. $stdenv/setup || exit 1
-
-tar xvfj $glibcSrc || exit 1
-(cd glibc-* && tar xvfj $linuxthreadsSrc) || exit 1
-
-(cd glibc-* && patch -p1 < $vaargsPatch) || exit 1
-
-mkdir build || exit 1
-cd build || exit 1
-LDFLAGS=-Wl,-S ../glibc-*/configure --prefix=$out --enable-add-ons --disable-profile || exit 1
-
-make || exit 1
-make install || exit 1
-make localedata/install-locales || exit 1
-strip -S $out/lib/*.a $out/lib/*.so $out/lib/gconv/*.so
-strip -s $out/bin/* $out/sbin/* $out/libexec/*
-
-ln -sf /etc/ld.so.cache $out/etc/ld.so.cache || exit 1
-
-(cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1
-
-exit 0

pkgs-ng/development/libraries/gnet/builder.sh

@@ -1,10 +0,0 @@
-#! /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

pkgs-ng/development/libraries/gtk+-1/gdk-pixbuf/builder.sh

@@ -1,10 +0,0 @@
-#! /bin/sh
-
-buildinputs="$gtk $libtiff $libjpeg $libpng"
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd gdk-pixbuf-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs-ng/development/libraries/gtk+-1/glib/builder.sh

@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd glib-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs-ng/development/libraries/gtk+-1/gtk+/builder.sh

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-buildinputs="$x11 $glib"
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd gtk+-* || exit 1
-./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1
-make || exit 1
-make install || exit 1
-
-echo "$x11 $glib" > $out/propagated-build-inputs || exit 1

pkgs-ng/development/libraries/gtk+/atk/builder.sh

@@ -1,10 +0,0 @@
-#! /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

pkgs-ng/development/libraries/gtk+/glib/builder.sh

@@ -1,10 +0,0 @@
-#! /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

pkgs-ng/development/libraries/gtk+/glib/default.fix

@@ -1,17 +0,0 @@
-{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;
-}

pkgs-ng/development/libraries/gtk+/gtk+/builder.sh

@@ -1,12 +0,0 @@
-#! /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 || exit 1
-make || exit 1
-make install || exit 1
-
-echo "$x11 $glib $atk $pango" > $out/propagated-build-inputs || exit 1

pkgs-ng/development/libraries/gtk+/gtk+/default.fix

@@ -1,30 +0,0 @@
-{ 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;
-}

pkgs-ng/development/libraries/gtk+/pango/builder.sh

@@ -1,12 +0,0 @@
-#! /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

pkgs-ng/development/libraries/gtk+/pango/default.fix

@@ -1,20 +0,0 @@
-{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;
-}

pkgs-ng/development/libraries/libIDL/builder.sh

@@ -1,11 +0,0 @@
-#! /bin/sh
-
-buildinputs="$pkgconfig $glib $lex $yacc"
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd libIDL-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1

pkgs-ng/development/libraries/libjpeg/builder.sh

@@ -1,15 +0,0 @@
-#! /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

pkgs-ng/development/libraries/libpng/builder.sh

@@ -1,16 +0,0 @@
-#! /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

pkgs-ng/development/libraries/libtiff/builder.sh

@@ -1,16 +0,0 @@
-#! /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

pkgs-ng/development/libraries/libxml2/default.fix

@@ -1,15 +0,0 @@
-{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;
-}

pkgs-ng/development/libraries/openssl/default.fix

@@ -1,11 +0,0 @@
-{stdenv, fetchurl, perl}: derivation {
-  name = "openssl-0.9.7c";
-  system = stdenv.system;
-  builder = ./builder.sh;
-  src = fetchurl {
-      url = http://www.openssl.org/source/openssl-0.9.7c.tar.gz;
-      md5 = "c54fb36218adaaaba01ef733cd88c8ec";
-    };
-  stdenv = stdenv;
-  perl = perl;
-}

pkgs-ng/development/libraries/pcre/builder.sh

@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd pcre-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs-ng/development/libraries/xft/builder.sh

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-buildinputs="$pkgconfig $fontconfig $x11"
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-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

pkgs-ng/development/libraries/xft/default.fix

@@ -1,18 +0,0 @@
-{stdenv, fetchurl, pkgconfig, x11, fontconfig}:
-
-assert !isNull pkgconfig && !isNull x11 && !isNull fontconfig;
-assert fontconfig.x11 == x11;
-
-derivation {
-  name = "xft-2.1.2";
-  system = stdenv.system;
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://pdx.freedesktop.org/software/fontconfig/releases/xft-2.1.2.tar.gz;
-    md5 = "defb7e801d4938b8b15a426ae57e2f3f";
-  };
-  stdenv = stdenv;
-  pkgconfig = pkgconfig;
-  x11 = x11;
-  fontconfig = fontconfig;
-}

pkgs-ng/development/libraries/zlib/builder.sh

@@ -1,10 +0,0 @@
-#! /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

pkgs-ng/development/libraries/zlib/default.fix

@@ -1,10 +0,0 @@
-{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;
-}

pkgs-ng/development/tools/build-managers/gnumake/builder.sh

@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd make-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs-ng/development/tools/misc/binutils/builder.sh

@@ -1,17 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd binutils-* || exit 1
-
-# Clear the default library search path.
-if test "$noSysDirs" == "1"; then
-    echo 'NATIVE_LIB_DIRS=' >> ld/configure.tgt || exit 1
-fi
-
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-
-strip -S $out/lib/*.a || exit 1

pkgs-ng/development/tools/misc/binutils/default.fix

@@ -1,11 +0,0 @@
-{stdenv, fetchurl}: derivation {
-  name = "binutils-2.14";
-  system = stdenv.system;
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/binutils/binutils-2.14.tar.bz2;
-    md5 = "2da8def15d28af3ec6af0982709ae90a";
-  };
-  stdenv = stdenv;
-  noSysDirs = stdenv.noSysDirs;
-}

pkgs-ng/development/tools/misc/pkgconfig/builder.sh

@@ -1,10 +0,0 @@
-#! /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

pkgs-ng/development/tools/parsing/bison/builder.sh

@@ -1,10 +0,0 @@
-#! /bin/sh
-
-buildinputs="$m4"
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd bison-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs-ng/development/tools/parsing/flex/builder.sh

@@ -1,10 +0,0 @@
-#! /bin/sh
-
-export buildinputs="$yacc"
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd flex-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs-ng/os-specific/linux/alsa/library/default.fix

@@ -1,10 +0,0 @@
-{stdenv, fetchurl}: derivation {
-  name = "alsa-lib-0.9.8";
-  system = stdenv.system;
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-0.9.8.tar.bz2;
-    md5 = "c9f163fb0623de1b92bf287712641f6e";
-  };
-  stdenv = stdenv;
-}

pkgs-ng/os-specific/linux/kernel-headers/builder.sh

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd linux-* || exit 1
-make include/linux/version.h || exit 1
-mkdir $out || exit 1
-mkdir $out/include || exit 1
-cp -prvd include/linux include/asm-i386 $out/include || exit 1
-cd $out/include || exit 1
-ln -s asm-i386 asm || exit 1

pkgs-ng/os-specific/linux/kernel-headers/default.fix

@@ -1,11 +0,0 @@
-{stdenv, fetchurl}: derivation {
-  # !!! check that this is a i386
-  name = "linux-headers-2.4.22-i386";
-  system = stdenv.system;
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.4/linux-2.4.22.tar.bz2;
-    md5 = "75dc85149b06ac9432106b8941eb9f7b";
-  };
-  stdenv = stdenv;
-}

pkgs-ng/servers/http/apache-httpd/builder.sh

@@ -1,23 +0,0 @@
-#! /bin/sh
-
-buildinputs="$openssl $db4 $expat $perl"
-. $stdenv/setup || exit 1
-
-if test $db4Support; then
-    extraflags="--with-berkeley-db=$db4 $extraflags"
-fi
-
-if test $sslSupport; then
-    extraflags="--enable-ssl --with-ssl=$openssl $extraflags"
-fi
-
-tar xvfz $src || exit 1
-cd httpd-* || exit 1
-./configure --prefix=$out \
- --with-expat=$expat --enable-mods-shared=all --without-gdbm \
- --enable-threads --with-devrandom=/dev/urandom \
- $extraflags || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1
-rm -rf $out/manual || exit 1

pkgs-ng/servers/http/apache-httpd/default.fix

@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, openssl, db4, expat, perl
-, sslSupport, db4Support
-}:
-derivation {
-  name = "apache-httpd-2.0.48";
-  system = stdenv.system;
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = ftp://ftp.cs.uu.nl/mirror/apache.org/dist/httpd/httpd-2.0.48.tar.gz;
-    md5 = "466c63bb71b710d20a5c353df8c1a19c";
-  };
-
-  stdenv = stdenv;
-  perl = perl;
-  openssl = if sslSupport then openssl else "";
-  db4 = if db4Support then db4 else "";
-  expat = expat;
-}

pkgs-ng/shells/bash/builder.sh

@@ -1,10 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd bash-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-(cd $out/bin; ln -s bash sh) || exit 1

pkgs-ng/shells/bash/default.fix

@@ -1,10 +0,0 @@
-{stdenv, fetchurl}: derivation {
-  name = "bash-2.05b";
-  system = stdenv.system;
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/bash/bash-2.05b.tar.gz;
-    md5 = "5238251b4926d778dfe162f6ce729733";
-  };
-  stdenv = stdenv;
-}

pkgs-ng/stdenv/generic/builder.sh

@@ -1,41 +0,0 @@
-#! /bin/sh
-
-# Set up the initial path.
-for i in $initialPath; do
-    PATH=$PATH:$i/bin
-done
-
-# Make output directories.
-mkdir $out || exit 1
-mkdir $out/bin || exit 1
-
-# Create the setup script.
-sed \
- -e "s^@OUT@^$out^g" \
- -e "s^@PREHOOK@^$prehook^g" \
- -e "s^@POSTHOOK@^$posthook^g" \
- -e "s^@INITIALPATH@^$initialPath^g" \
- -e "s^@PARAM1@^$param1^g" \
- -e "s^@PARAM2@^$param2^g" \
- -e "s^@PARAM3@^$param3^g" \
- -e "s^@PARAM4@^$param4^g" \
- -e "s^@PARAM5@^$param5^g" \
- < $setup > $out/setup || exit 1
-
-# Create the gcc wrapper.
-sed \
- -e 's^@GCC\@^$NIX_CC^g' \
- < $gccwrapper > $out/bin/gcc || exit 1
-chmod +x $out/bin/gcc || exit 1
-ln -s gcc $out/bin/cc || exit 1
-
-# Create the g++ wrapper.
-sed \
- -e 's^@GCC\@^$NIX_CXX^g' \
- < $gccwrapper > $out/bin/g++ || exit 1
-chmod +x $out/bin/g++ || exit 1
-ln -s g++ $out/bin/c++ || exit 1
-
-# Create the ld wrapper.
-cp $ldwrapper $out/bin/ld || exit 1
-chmod +x $out/bin/ld || exit 1

pkgs-ng/stdenv/generic/default.fix

@@ -1,23 +0,0 @@
-{system, name, noSysDirs, prehook, posthook, initialPath, 
-  param1, param2, param3, param4, param5}:
-derivation {
-  name = name;
-  system = system;
-  builder = ./builder.sh;
-  noSysDirs = noSysDirs;
-
-  setup = ./setup.sh;
-  gccwrapper = ./gcc-wrapper.sh;
-  ldwrapper = ./ld-wrapper.sh;
-
-  prehook = prehook;
-  posthook = posthook;
-
-  initialPath = initialPath;
-  # TODO: make this more elegant.
-  param1 = param1;
-  param2 = param2;
-  param3 = param3;
-  param4 = param4;
-  param5 = param5;
-}

pkgs-ng/stdenv/generic/gcc-wrapper.sh

@@ -1,42 +0,0 @@
-#! /bin/sh
-
-IFS=
-
-justcompile=0
-for i in $@; do
-    if test "$i" == "-c"; then
-        justcompile=1
-    elif test "$i" == "-S"; then
-        justcompile=1
-    elif test "$i" == "-E"; then
-        justcompile=1
-    elif test "$i" == "-E"; then
-        justcompile=1
-    elif test "$i" == "-M"; then
-        justcompile=1
-    elif test "$i" == "-MM"; then
-        justcompile=1
-    fi
-done
-
-IFS=" "
-extra=($NIX_CFLAGS_COMPILE)
-if test "$justcompile" != "1"; then
-    extra=(${extra[@]} $NIX_CFLAGS_LINK)
-    for i in $NIX_LDFLAGS; do
-        extra=(${extra[@]} "-Wl,$i")
-    done
-    if test "$NIX_STRIP_DEBUG" == "1"; then
-        extra=(${extra[@]} -g0 -Wl,-s)
-    fi
-fi
-
-if test "$NIX_DEBUG" == "1"; then
-  echo "extra flags to @GCC@:" >&2
-  for i in ${extra[@]}; do
-      echo "  $i" >&2
-  done
-fi
-
-IFS=
-exec @GCC@ $@ ${extra[@]}

pkgs-ng/stdenv/generic/ld-wrapper.sh

@@ -1,17 +0,0 @@
-#! /bin/sh
-
-IFS=" "
-extra=($NIX_CFLAGS_LINK $NIX_LDFLAGS)
-if test "$NIX_STRIP_DEBUG" == "1"; then
-    extra=(${extra[@]} -s)
-fi
-
-if test "$NIX_DEBUG" == "1"; then
-  echo "extra flags to @LD@:" >&2
-  for i in ${extra[@]}; do
-      echo "  $i" >&2
-  done
-fi
-
-IFS=
-exec $NIX_LD $@ ${extra[@]}

pkgs-ng/stdenv/generic/setup.sh

@@ -1,67 +0,0 @@
-# Set up the initial path.
-for i in @INITIALPATH@; do
-    PATH=$PATH:$i/bin
-done
-echo $PATH
-
-# Execute the pre-hook.
-param1=@PARAM1@
-param2=@PARAM2@
-param3=@PARAM3@
-param4=@PARAM4@
-param5=@PARAM5@
-. @PREHOOK@
-
-# Add the directory containing the GCC wrappers to the PATH.
-export PATH=@OUT@/bin:$PATH
-
-# Recursively add all buildinputs to the relevant environment variables.
-addtoenv()
-{
-    pkgs="$buildinputs $1"
-
-    if test -d $1/bin; then
-        export PATH=$1/bin:$PATH
-    fi
-
-    if test -d $1/lib; then
-        export NIX_CFLAGS_LINK="-L$1/lib $NIX_CFLAGS_LINK"
-        export NIX_LDFLAGS="-rpath $1/lib $NIX_LDFLAGS"
-    fi
-
-    if test -d $1/lib/pkgconfig; then
-        export PKG_CONFIG_PATH=$1/lib/pkgconfig:$PKG_CONFIG_PATH
-    fi
-
-    if test -d $1/include; then
-        export NIX_CFLAGS_COMPILE="-I$1/include $NIX_CFLAGS_COMPILE"
-    fi
-
-    if test -f $1/propagated-build-inputs; then
-        for i in $(cat $1/propagated-build-inputs); do
-            addtoenv $i
-        done
-    fi
-}
-
-oldbuildinputs=$buildinputs
-buildinputs=
-
-for i in $oldbuildinputs; do
-    addtoenv $i
-done
-
-# Add the output as an rpath.
-if test "$NIX_NO_SELF_RPATH" != "1"; then
-    export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
-fi
-
-# Strip debug information by default.
-export NIX_STRIP_DEBUG=1
-
-# Execute the post-hook.
-. @POSTHOOK@
-
-if test "$NIX_DEBUG" == "1"; then
-    echo "Setup: PATH=$PATH"
-fi

pkgs-ng/stdenv/native/default.fix

@@ -1,13 +0,0 @@
-{system}: (import ../generic) {
-  name = "stdenv-native";
-  system = system;
-  prehook = ./prehook.sh;
-  posthook = ./posthook.sh;
-  initialPath = "/usr/local /usr /";
-  param1 = "";
-  param2 = "";
-  param3 = "";
-  param4 = "";
-  param5 = "";
-  noSysDirs = false;
-}

pkgs-ng/stdenv/native/prehook.sh

@@ -1,5 +0,0 @@
-export SHELL=/bin/sh
-
-export NIX_CC=/usr/bin/gcc
-export NIX_CXX=/usr/bin/g++
-export NIX_LD=/usr/bin/ld

pkgs-ng/stdenv/nix-linux/boot.fix

@@ -1,13 +0,0 @@
-{system, glibc}: (import ../generic) {
-  name = "stdenv-linux-boot";
-  system = system;
-  prehook = ./prehook-boot.sh;
-  posthook = ./posthook.sh;
-  initialPath = "/usr/local /usr /";
-  param1 = "";
-  param2 = "";
-  param3 = "";
-  param4 = glibc;
-  param5 = "";
-  noSysDirs = true;
-}

pkgs-ng/stdenv/nix-linux/default.fix

@@ -1,13 +0,0 @@
-{bootStdenv, pkgs, glibc}: (import ../generic) {
-  name = "stdenv-nix-linux";
-  system = bootStdenv.system;
-  prehook = ./prehook.sh;
-  posthook = ./posthook.sh;
-  initialPath = (import ../nix/path.fix) {pkgs = pkgs};
-  param1 = pkgs.bash;
-  param2 = pkgs.gcc;
-  param3 = pkgs.binutils;
-  param4 = glibc;
-  param5 = "";
-  noSysDirs = true;
-}

pkgs-ng/stdenv/nix-linux/prehook-boot.sh

@@ -1,12 +0,0 @@
-export SHELL=/bin/sh
-
-export NIX_CC=/usr/bin/gcc
-export NIX_CXX=/usr/bin/g++
-export NIX_LD=/usr/bin/ld
-
-export NIX_CFLAGS_COMPILE="-isystem $param4/include $NIX_CFLAGS_COMPILE"
-export NIX_CFLAGS_LINK="-L$param4/lib $NIX_CFLAGS_LINK"
-export NIX_LDFLAGS="-dynamic-linker $param4/lib/ld-linux.so.2 -rpath $param4/lib $NIX_LDFLAGS"
-
-export NIX_LIBC_INCLUDES="$param4/include"
-export NIX_LIBC_LIBS="$param4/lib"

pkgs-ng/stdenv/nix-linux/prehook.sh

@@ -1,12 +0,0 @@
-export SHELL=$param1
-
-export NIX_CC=$param2/bin/gcc
-export NIX_CXX=$param2/bin/g++
-export NIX_LD=$param3/bin/ld
-
-export NIX_CFLAGS_COMPILE="-isystem $param4/include $NIX_CFLAGS_COMPILE"
-export NIX_CFLAGS_LINK="-L$param4/lib -L$param2/lib $NIX_CFLAGS_LINK"
-export NIX_LDFLAGS="-dynamic-linker $param4/lib/ld-linux.so.2 -rpath $param4/lib -rpath $param2/lib $NIX_LDFLAGS"
-
-export NIX_LIBC_INCLUDES="$param4/include"
-export NIX_LIBC_LIBS="$param4/lib"

pkgs-ng/stdenv/nix/default.fix

@@ -1,13 +0,0 @@
-{bootStdenv, pkgs}: (import ../generic) {
-  name = "stdenv-nix";
-  system = bootStdenv.system;
-  prehook = ./prehook.sh;
-  posthook = ./posthook.sh;
-  initialPath = (import ./path.fix) {pkgs = pkgs};
-  param1 = pkgs.bash;
-  param2 = pkgs.gcc;
-  param3 = pkgs.binutils;
-  param4 = "";
-  param5 = "";
-  noSysDirs = false;
-}

pkgs-ng/stdenv/nix/prehook.sh

@@ -1,7 +0,0 @@
-export SHELL=$param1
-
-echo "SHELL = $SHELL"
-
-export NIX_CC=$param2/bin/gcc
-export NIX_CXX=$param2/bin/g++
-export NIX_LD=$param3/bin/ld

pkgs-ng/system/all-packages-generic.fix

@@ -1,401 +0,0 @@
-# This file evaluates to a function that, when supplied with a system
-# identifier and a standard build environment, returns the set of all
-# packages provided by the Nix Package Collection.
-
-{system, stdenv}: rec {
-
-  ### BUILD SUPPORT
-
-  fetchurl = (import ../build-support/fetchurl) {
-    stdenv = stdenv;
-  };
-
-
-  ### TOOLS
-
-  coreutils = (import ../tools/misc/coreutils) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  findutils = (import ../tools/misc/findutils) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  diffutils = (import ../tools/text/diffutils) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  gnused = (import ../tools/text/gnused) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  gnugrep = (import ../tools/text/gnugrep) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    pcre = pcre;
-  };
-
-  gawk = (import ../tools/text/gawk) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  ed = (import ../tools/text/ed) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  gnutar = (import ../tools/archivers/gnutar) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  zip = (import ../tools/archivers/zip) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  gzip = (import ../tools/compression/gzip) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  bzip2 = (import ../tools/compression/bzip2) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  wget = (import ../tools/networking/wget) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-
-  ### SHELLS
-
-  bash = (import ../shells/bash) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-
-  ### DEVELOPMENT
-
-  binutils = (import ../development/tools/misc/binutils) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  gnum4 = (import ../development/tools/misc/gnum4) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  pkgconfig = (import ../development/tools/misc/pkgconfig) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  gnumake = (import ../development/tools/build-managers/gnumake) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  bison = (import ../development/tools/parsing/bison) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    m4 = gnum4;
-  };
-
-  flex = (import ../development/tools/parsing/flex) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    yacc = bison;
-  };
-
-  gcc = (import ../development/compilers/gcc) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    binutils = binutils;
-  };
-
-  perl = (import ../development/interpreters/perl) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  pcre = (import ../development/libraries/pcre) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  glibc = (import ../development/libraries/glibc) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    kernelHeaders = kernelHeaders;
-  };
-
-  aterm = (import ../development/libraries/aterm) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  expat = (import ../development/libraries/expat) {
-    fetchurl = fetchurl;
-    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;
-  };
-
-  openssl = (import ../development/libraries/openssl) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    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;
-  };
-
-  glib1 = (import ../development/libraries/gtk+-1/glib) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  gtk1 = (import ../development/libraries/gtk+-1/gtk+) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    x11 = xfree86;
-    glib = glib1;
-  };
-
-  gdkpixbuf = (import ../development/libraries/gtk+-1/gdk-pixbuf) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    gtk = gtk1;
-    libtiff = libtiff;
-    libjpeg = libjpeg;
-    libpng = libpng;
-  };
-
-  gnet = (import ../development/libraries/gnet) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    pkgconfig = pkgconfig;
-    glib = glib;
-  };
-
-  libIDL = (import ../development/libraries/libIDL) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    pkgconfig = pkgconfig;
-    glib = glib;
-    lex = flex;
-    yacc = bison;
-  };
-
-
-  ### SERVERS
-
-  apacheHttpd = (import ../servers/http/apache-httpd) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    sslSupport = true;
-    db4Support = true;
-    perl = perl;
-    openssl = openssl;
-    db4 = db4;
-    expat = expat;
-  };
-
-  xfree86 = (import ../servers/x11/xfree86) {
-    buildServer = false;
-    buildClientLibs = true;
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    flex = flex;
-    bison = bison;
-  };
-
-
-  ### OS-SPECIFIC
-
-  kernelHeaders = (import ../os-specific/linux/kernel-headers) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  alsaLib = (import ../os-specific/linux/alsa/library) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-
-  ### APPLICATIONS
-
-  subversion = (import ../applications/version-management/subversion) {
-    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;
-  };
-
-  sylpheed = (import ../applications/networking/mailreaders/sylpheed) {
-    sslSupport = true;
-    imageSupport = true;
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    gtk = gtk1;
-    openssl = openssl;
-    gdkpixbuf = gdkpixbuf;
-  };
-
-  firebird = (import ../applications/networking/browsers/firebird) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    pkgconfig = pkgconfig;
-    gtk = gtk;
-    perl = perl;
-    zip = zip;
-    libIDL = libIDL;
-  };
-
-  MPlayer = (import ../applications/video/MPlayer) {
-    alsaSupport = true;
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    x11 = xfree86;
-    freetype = freetype;
-    alsa = alsaLib;
-  };
-
-  MPlayerPlugin = (import ../applications/video/mplayerplug-in) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    x11 = xfree86;
-  };
-
-  gqview = (import ../applications/graphics/gqview) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    pkgconfig = pkgconfig;
-    gtk = gtk;
-    libpng = libpng;
-  };
-
-}

pkgs-ng/system/all-packages.fix

@@ -1,50 +0,0 @@
-# This file evaluates to a function that, when supplied with a system
-# identifier, returns the set of all packages provided by the Nix
-# Package Collection.  It does this by supplying
-# `all-packages-generic.fix' with a standard build environment.
-#
-# On Linux systems, the standard build environment consists of
-# Nix-built instances glibc and the `standard' Unix tools, i.e., the
-# Posix utilities, the GNU C compiler, and so on.  On other systems,
-# we use the native C library.
-
-{system}: let {
-  allPackages = import ./all-packages-generic.fix;
-
-  # The native (i.e., impure) build environment.  This one uses the
-  # tools installed on the system outside of the Nix environment,
-  # i.e., the stuff in /bin, /usr/bin, etc.  This environment should
-  # be used with care, since many Nix packages will not build properly
-  # with it (e.g., because they require GNU Make).
-  stdenvNative = (import ../stdenv/native) {system = system};
-  stdenvNativePkgs = allPackages {system = system; stdenv = stdenvNative};
-
-  # The Nix build environment.
-  stdenvNix = (import ../stdenv/nix) {
-    bootStdenv = stdenvNative;
-    pkgs = stdenvNativePkgs;
-  };
-  stdenvNixPkgs = allPackages {system = system; stdenv = stdenvNix};
-
-  # The Linux build environment consists of the Nix build environment
-  # built against the GNU C Library.
-  stdenvLinuxGlibc = stdenvNativePkgs.glibc;
-  stdenvLinuxBoot = (import ../stdenv/nix-linux/boot.fix) {
-    system = system;
-    glibc = stdenvLinuxGlibc;
-  };
-  stdenvLinuxBootPkgs = allPackages {system = system; stdenv = stdenvLinuxBoot};
-
-  stdenvLinux = (import ../stdenv/nix-linux) {
-    bootStdenv = stdenvLinuxBoot;
-    pkgs = stdenvLinuxBootPkgs;
-    glibc = stdenvLinuxGlibc;
-  };
-  stdenvLinuxPkgs = allPackages {system = system; stdenv = stdenvLinux};
-
-  # Select the right instantiation.
-  body =
-    if system == "i686-suse-linux"
-    then stdenvLinuxPkgs
-    else stdenvNixPkgs;
-}

pkgs-ng/system/i686-suse-linux.fix

@@ -1 +0,0 @@
-(import ./user-environment.fix) {system = "i686-suse-linux"}

pkgs-ng/system/populate-linkdirs.pl

@@ -1,65 +0,0 @@
-#! /usr/bin/perl -w
-
-use strict;
-use Cwd;
-
-my $selfdir = $ENV{"out"};
-mkdir "$selfdir", 0755 || die "error creating $selfdir";
-
-# For each activated package, create symlinks.
-
-sub createLinks {
-    my $srcdir = shift;
-    my $dstdir = shift;
-
-    my @srcfiles = glob("$srcdir/*");
-
-    foreach my $srcfile (@srcfiles) {
-        my $basename = $srcfile;
-        $basename =~ s/^.*\///g; # strip directory
-        my $dstfile = "$dstdir/$basename";
-	if ($srcfile =~ /\/envpkgs$/) {
-	} elsif (-d $srcfile) {
-            # !!! hack for resolving name clashes
-            if (!-e $dstfile) {
-                mkdir $dstfile, 0755 || 
-                    die "error creating directory $dstfile";
-            }
-            -d $dstfile or die "$dstfile is not a directory";
-            createLinks($srcfile, $dstfile);
-        } elsif (-l $dstfile) {
-            my $target = readlink($dstfile);
-            die "collission between $srcfile and $target";
-        } else {
-#            print "linking $dstfile to $srcfile\n";
-            symlink($srcfile, $dstfile) ||
-                die "error creating link $dstfile";
-        }
-    }
-}
-
-my %done;
-
-sub addPkg {
-    my $pkgdir = shift;
-
-    return if (defined $done{$pkgdir});
-    $done{$pkgdir} = 1;
-
-    print "merging $pkgdir\n";
-
-    createLinks("$pkgdir", "$selfdir");
-
-#    if (-f "$pkgdir/envpkgs") {
-#	my $envpkgs = `cat $pkgdir/envpkgs`;
-#	chomp $envpkgs;
-#	my @envpkgs = split / +/, $envpkgs;
-#	foreach my $envpkg (@envpkgs) {
-#	    addPkg($envpkg);
-#	}
-#    }
-}
-
-foreach my $pkgdir (split ' ', $ENV{"dirs"}) {
-    addPkg($pkgdir);
-}

pkgs-ng/system/user-environment.fix

@@ -1,30 +0,0 @@
-# Given a system identifier, this function returns a derivation of a
-# user environment, i.e., a set of symbolic links to `activated'
-# packages.  The resulting package is typically passed to the
-# `nix-switch' command in order to actually activate it.
-
-{system}: let {
-  # All activated packages.
-  pkgs = (import ./all-packages.fix) {system = system};
-
-  # The packages selection for inclusion in the user environment.
-  # This list should be generated automatically by a package
-  # management user interface.
-  selectedPkgs = [
-    pkgs.subversion
-    pkgs.pan
-    pkgs.sylpheed
-    pkgs.firebird
-    pkgs.MPlayer
-    pkgs.MPlayerPlugin
-    pkgs.gqview
-  ];
-
-  # Create a user environment.
-  body = derivation { 
-    name = "user-environment";
-    system = system;
-    builder = ./populate-linkdirs.pl;
-    dirs = selectedPkgs;
-  };
-}

pkgs-ng/tools/compression/bzip2/builder.sh

@@ -1,8 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd bzip2-* || exit 1
-make || exit 1
-make install PREFIX=$out || exit 1

pkgs-ng/tools/compression/gzip/builder.sh

@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd gzip-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs-ng/tools/misc/coreutils/builder.sh

@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd coreutils-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs-ng/tools/misc/findutils/builder.sh

@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd findutils-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs-ng/tools/networking/wget/builder.sh

@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd wget-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs-ng/tools/networking/wget/default.fix

@@ -1,10 +0,0 @@
-{stdenv, fetchurl}: derivation {
-  name = "wget-1.9";
-  system = stdenv.system;
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/wget/wget-1.9.tar.gz;
-    md5 = "18ac093db70801b210152dd69b4ef08a";
-  };
-  stdenv = stdenv;
-}

pkgs-ng/tools/text/diffutils/builder.sh

@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd diffutils-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs-ng/tools/text/gawk/builder.sh

@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd gawk-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs-ng/tools/text/gnugrep/builder.sh

@@ -1,10 +0,0 @@
-#! /bin/sh
-
-buildinputs="$pcre"
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd grep-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs-ng/tools/text/gnused/builder.sh

@@ -1,9 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd sed-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs/BUGS

@@ -0,0 +1,50 @@
+* If NIX_DEBUG is turned on (set to "1"), autoconf configure scripts
+  may fail to find the correct preprocessor:
+
+    checking how to run the C preprocessor... /lib/cpp
+
+
+* When building gcc using a Nix gcc, generated libraries link against
+  the libraries of the latter:
+
+    $ ldd /nix/store/3b1d3995c4edbf026be5c73f66f69245-gcc-3.3.3/lib/libstdc++.so
+    ...
+    libgcc_s.so.1 => /nix/store/1f19e61d1b7051f1131f78b41b2a0e7e-gcc-3.3.2/lib/libgcc_s.so.1 (0x400de000)
+    (wrong! should be .../3b1d.../lib/libgcc_s...)
+    ...
+
+
+* Subtle problems can occur if the Nix store directory or one of its
+  parents is a symlink.  E.g., purity checks can barf:
+
+    impure path `/data/nix/store/099cd9aee7d056a9922fd6dd116a3f5c-gcc-3.3.3/bin/../lib/gcc-lib/i686-pc-linux-gnu/3.3.3/crtbegin.o' used in link
+
+  (This happened because /nix was a symlink to /data/nix.)  Maybe we
+  should disallow this entirely, since, exactly because it is
+  perfectly legal for a builder to expand a symlink, we can end up
+  with derivates referring to paths that existed in the build
+  environment but not in the target environment.
+
+  Disallowing this can be highly inconvenient, since it makes it
+  harder to move the Nix store to a different file system.  (On Linux,
+  `bind' mounts can help here.) 
+
+
+* In libXt:
+
+/bin/sh ./libtool --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.     -DXTHREADS -DXUSE_MTSAFE_API -I/nix/store/aadf0bd4a908da11d14f6538503b8408-libX11-6.2.1/include -I/nix/store/ba366e3b944ead64ec9b0490bb615874-xproto-6.6.1/include   -I./include/X11 -g -O2 -c -o ActionHook.lo `test -f 'ActionHook.c' || echo './'`ActionHook.c
+mkdir .libs
+ gcc -DHAVE_CONFIG_H -I. -I. -I. -DXTHREADS -DXUSE_MTSAFE_API -I/nix/store/aadf0bd4a908da11d14f6538503b8408-libX11-6.2.1/include -I/nix/store/ba366e3b944ead64ec9b0490bb615874-xproto-6.6.1/include -I./include/X11 -g -O2 -c ActionHook.c  -fPIC -DPIC -o .libs/ActionHook.o
+In file included from IntrinsicI.h:55,
+                 from ActionHook.c:69:
+include/X11/IntrinsicP.h:54:27: X11/Intrinsic.h: No such file or directory
+
+
+* Then:
+
+ gcc -DHAVE_CONFIG_H -I. -I. -I. -DXTHREADS -DXUSE_MTSAFE_API -I/nix/store/aadf0bd4a908da11d14f6538503b8408-libX11-6.2.1/include -I/nix/store/ba366e3b944ead64ec9b0490bb615874-xproto-6.6.1/include -I./include -I./include/X11 -g -O2 -c ActionHook.c  -fPIC -DPIC -o .libs/ActionHook.o
+In file included from IntrinsicI.h:55,
+                 from ActionHook.c:69:
+include/X11/IntrinsicP.h:202:25: X11/ObjectP.h: No such file or directory
+
+(moved to include/X11; should edit include/Makefile.am)

pkgs/MPlayer/MPlayer-build.sh

@@ -1,19 +0,0 @@
-#! /bin/sh
-
-envpkgs="$freetype $x11"
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-tar xvfj $fonts || exit 1
-cd MPlayer-* || exit 1
-./configure --prefix=$out --with-win32libdir=$win32codecs \
- --with-x11incdir=$x11/include --with-x11libdir=$x11/lib \
- --with-reallibdir=$win32codecs \
- --disable-sdl --disable-esd --disable-xanim --disable-cdparanoia --disable-directfb \
- --disable-lirc --disable-svga --disable-libdv \
- --disable-vorbis --disable-png --disable-jpeg --disable-gif \
- --enable-runtime-cpudetection \
- || exit 1
-make || exit 1
-make install || exit 1
-cp -p ../font-arial-iso-8859-1/font-arial-18-iso-8859-1/* $out/share/mplayer/font || exit 1

pkgs/MPlayer/MPlayer.fix

@@ -1,21 +0,0 @@
-Package(
-  [ ("name", "MPlayer-1.0pre2")
-
-  , ("build", Relative("MPlayer/MPlayer-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre2.tar.bz2")
-      , ("md5", "a60c179468f85e83e3f9e1922e81ad64")
-      ]))
-
-  , ("fonts", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2")
-      , ("md5", "1ecd31d17b51f16332b1fcc7da36b312")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("x11", IncludeFix("xfree86/xfree86.fix"))
-  , ("freetype", IncludeFix("freetype/freetype.fix"))
-  , ("win32codecs", IncludeFix("win32codecs/win32codecs.fix"))
-  ]
-)

pkgs/README

@@ -95,3 +95,19 @@ ELSE IF it's an APPLICATION:
       ./applications/networking/misc
   ELSE
     ./applications/misc
+
+ELSE IF it's DATA (i.e., doe not have a straight-forward executable semantics):
+
+  IF it's related to SGML/XML processing:
+    IF it's a XML DTD:
+      ./data/sgml+xml/schemas/xml-dtd
+    ELSE IF it's an XSLT stylesheet (okay, these are executable...):
+      ./data/sgml+xml/stylesheets/xslt
+
+ELSE IF it's a GAME:
+
+  ./games
+
+ELSE:
+
+  ./misc

pkgs/STABLE

@@ -0,0 +1 @@
+1

pkgs/TODO

@@ -0,0 +1,16 @@
+* Bump freetype to 2.1.7 (but it breaks Pango 1.2.5).
+
+* Patch development/tools/misc/libtool not to search standard
+  directories for libraries (like setup.sh does now). [do we want
+  this?]
+
+* In setup.sh: add configureFlagsArray or something
+
+* Inform freedesktop people that Xaw requires Xpm.
+
+* After building gcc, filter out references to /tmp/nix... in
+  .../lib/libsupc++.la and .../lib/libstdc++.la
+
+* diffutils retains a dependency on coreutils/bin/pr; causes stdenv to
+  depend on 2 copies of coreutils (the first one impure in
+  stdenv-nix-linux!)