* GNU hello package added.

svn path=/nixpkgs/branches/logistics/; revision=397

pkgs/MPlayer/MPlayer-build.sh

@@ -1,12 +1,13 @@
 #! /bin/sh
 
-envpkgs="$freetype"
+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 \

pkgs/MPlayer/MPlayer.fix

@@ -1,11 +1,11 @@
 Package(
-  [ ("name", "MPlayer-0.90")
+  [ ("name", "MPlayer-0.91")
 
   , ("build", Relative("MPlayer/MPlayer-build.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-0.90.tar.bz2")
-      , ("md5", "9a9f294bbaab2071ecbc327f4e870be8")
+      [ ("url", "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-0.91.tar.bz2")
+      , ("md5", "bb09138564ddf954392d20dbc4b88ebd")
       ]))
 
   , ("fonts", App(IncludeFix("fetchurl/fetchurl.fix"),
@@ -14,6 +14,7 @@ Package(
       ]))
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("x11", IncludeFix("xfree86/xfree86.fix"))
   , ("freetype", IncludeFix("freetype/freetype.fix"))
   , ("win32codecs", IncludeFix("win32codecs/win32codecs.fix"))
   ]

pkgs/Xft/Xft-build.sh

@@ -1,11 +1,11 @@
 #! /bin/sh
 
-envpkgs="$fontconfig"
+envpkgs="$fontconfig $x11"
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
 cd fcpackage*/Xft || exit 1
-./configure --prefix=$out --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1
+./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1
 make || exit 1
 make install || exit 1
 echo $envpkgs > $out/envpkgs || exit 1

pkgs/Xft/Xft.fix

@@ -9,6 +9,7 @@ Package(
       ]))
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("x11", IncludeFix("xfree86/xfree86.fix"))
   , ("fontconfig", IncludeFix("fontconfig/fontconfig.fix"))
   ]
 )

pkgs/baseenv/baseenv-build.sh

@@ -9,20 +9,17 @@ sed \
  -e s^@OUT\@^$out^g \
  < $setup > $out/setup || exit 1
 
-gcc='$NIX_CC'
-
 sed \
- -e s^@GCC\@^$gcc^g \
+ -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
-
-gcc='$NIX_CXX'
+ln -s gcc $out/bin/cc || exit 1
 
 sed \
- -e s^@GCC\@^$gcc^g \
+ -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
 
-ln -s g++ $out/bin/c++
+cp $ldwrapper $out/bin/ld || exit 1
+chmod +x $out/bin/ld || exit 1

pkgs/baseenv/baseenv.fix

@@ -1,8 +1,9 @@
 Package(
-  [ ("name", "stdenv-native")
+  [ ("name", "baseenv")
   , ("build", Relative("baseenv/baseenv-build.sh"))
 
   , ("setup", Relative("baseenv/setup.sh"))
   , ("gccwrapper", Relative("baseenv/gcc-wrapper.sh"))
+  , ("ldwrapper", Relative("baseenv/ld-wrapper.sh"))
   ]
 )

pkgs/baseenv/gcc-wrapper.sh

@@ -6,26 +6,33 @@ justcompile=0
 for i in $@; do
     if test "$i" == "-c"; then
         justcompile=1
-    fi
-    if test "$i" == "-S"; then
+    elif test "$i" == "-S"; then
         justcompile=1
-    fi
-    if test "$i" == "-E"; then
+    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)
+extra=($NIX_CFLAGS_COMPILE)
 if test "$justcompile" != "1"; then
-    extra=(${extra[@]} $NIX_LDFLAGS)
+    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[@]} -Wl,-s)
+	extra=(${extra[@]} -g0 -Wl,-s)
     fi
 fi
 
 if test "$NIX_DEBUG" == "1"; then
-  echo "extra gcc flags:" >&2
+  echo "extra flags to @GCC@:" >&2
   for i in ${extra[@]}; do
       echo "  $i" >&2
   done

pkgs/baseenv/ld-wrapper.sh

@@ -0,0 +1,17 @@
+#! /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/baseenv/setup.sh

@@ -11,7 +11,8 @@ addtoenv()
     fi
 
     if test -d $1/lib; then
-	export NIX_LDFLAGS="-L $1/lib -Wl,-rpath,$1/lib $NIX_LDFLAGS"
+	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
@@ -33,7 +34,7 @@ for i in $oldenvpkgs; do
 done
 
 # Add the output as an rpath.
-export NIX_LDFLAGS="-Wl,-rpath,$out/lib $NIX_LDFLAGS"
+export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
 
 # Strip debug information by default.
 export NIX_STRIP_DEBUG=1

pkgs/binutils/binutils-build.sh

@@ -4,6 +4,12 @@
 
 tar xvfj $src || exit 1
 cd binutils-* || exit 1
+
+# Clear the default library search path.
+echo 'NATIVE_LIB_DIRS=' >> ld/configure.tgt || exit 1
+
 ./configure --prefix=$out || exit 1
 make || exit 1
 make install || exit 1
+
+strip -S $out/lib/*.a || exit 1

pkgs/boehmgc/boehmgc-build.sh

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

pkgs/boehmgc/boehmgc.fix

@@ -0,0 +1,12 @@
+Package(
+  [ ("name", "boehmgc-6.2")
+  , ("build", Relative("boehmgc/boehmgc-build.sh"))
+
+  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.2.tar.gz")
+      , ("md5", "15492b14ca7b9a9e035238611e9cd1e3")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  ]
+)

pkgs/fontconfig/fontconfig-build.sh

@@ -1,13 +1,17 @@
 #! /bin/sh
 
-envpkgs="$freetype $expat"
+envpkgs="$freetype $expat $x11"
 . $stdenv/setup || exit 1
 export PATH=$ed/bin:$PATH
 
+# 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 fcpackage*/fontconfig || exit 1
 ./configure --prefix=$out --with-confdir=$out/etc/fonts \
- --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib \
+ --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

pkgs/fontconfig/fontconfig.fix

@@ -9,6 +9,7 @@ Package(
       ]))
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("x11", IncludeFix("xfree86/xfree86.fix"))
   , ("freetype", IncludeFix("freetype/freetype.fix"))
   , ("expat", IncludeFix("expat/expat.fix"))
   , ("ed", IncludeFix("ed/ed.fix"))

pkgs/gcc-2.95/gcc-build.sh

@@ -0,0 +1,50 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+export PATH=$binutils/bin:$PATH
+
+tar xvfz $src || exit 1
+
+# 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
+
+# Configure.
+mkdir build || exit 1
+cd build || exit 1
+../gcc-*/configure --prefix=$out --enable-languages=c || exit 1
+
+# 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
+
+# Build and install.
+make bootstrap || exit 1
+make install || exit 1

pkgs/gcc-2.95/gcc.fix

@@ -0,0 +1,13 @@
+Package(
+  [ ("name", "gcc-2.95.3")
+
+  , ("build", Relative("gcc-2.95/gcc-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-2.95.3/gcc-2.95.3.tar.gz")
+      , ("md5", "f3ad4f32c2296fad758ed051b5ac8e28")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  ]
+)

pkgs/gcc/gcc-build.sh

@@ -1,10 +1,50 @@
 #! /bin/sh
 
 . $stdenv/setup || exit 1
+export PATH=$binutils/bin:$PATH
 
 tar xvfj $src || exit 1
+
+# 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
+
+# Configure.
 mkdir build || exit 1
 cd build || exit 1
 ../gcc-*/configure --prefix=$out --enable-languages=c,c++ || exit 1
+
+# Patch some of the makefiles to force linking against our own glibc.
+extraflags="-Wl,-s -isystem $linux/include $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
+
+# Build and install.
 make bootstrap || exit 1
 make install || exit 1

pkgs/gcc/gcc.fix

@@ -9,5 +9,7 @@ Package(
       ]))
 
   , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
+  , ("binutils", IncludeFix("binutils/binutils.fix"))
+  , ("linux", IncludeFix("linux-headers/linux-headers.fix"))
   ]
 )

pkgs/gnupatch/gnupatch-build.sh

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

pkgs/gnupatch/gnupatch.fix

@@ -0,0 +1,13 @@
+Package(
+  [ ("name", "gnupatch-2.5.4")
+
+  , ("build", Relative("gnupatch/gnupatch-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/patch/patch-2.5.4.tar.gz")
+      , ("md5", "ee5ae84d115f051d87fcaaef3b4ae782")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  ]
+)

pkgs/gqview/gqview-build.sh

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+envpkgs="$gtk $libpng $zlib"
+. $stdenv/setup || exit 1
+export PATH=$pkgconfig/bin:$PATH
+
+NIX_CFLAGS_COMPILE="-I$libpng/include -I$zlib/include $NIX_CFLAGS_COMPILE"
+
+tar xvfz $src || exit 1
+cd gqview-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1

pkgs/gqview/gqview.fix

@@ -0,0 +1,17 @@
+Package(
+  [ ("name", "gqview-1.3.2")
+
+  , ("build", Relative("gqview/gqview-build.sh"))
+
+  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://heanet.dl.sourceforge.net/sourceforge/gqview/gqview-1.3.2.tar.gz")
+      , ("md5", "0f2ce36475b2cdc8013545f5e3268034")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
+  , ("gtk", IncludeFix("gtk+/gtk+.fix"))
+  , ("libpng", IncludeFix("libpng/libpng.fix"))
+  , ("zlib", IncludeFix("zlib/zlib.fix"))
+  ]
+)

pkgs/graphviz/graphviz-build.sh

@@ -0,0 +1,12 @@
+#! /bin/sh
+
+envpkgs="$zlib $libpng $libjpeg $expat $freetype"
+. $stdenv/setup || exit 1
+
+NIX_CFLAGS_COMPILE="-I$zlib/include -I$libpng/include -I$libjpeg/include -I$expat/include $NIX_CFLAGS_COMPILE"
+
+tar xvfz $src || exit 1
+cd graphviz-* || exit 1
+./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1
+make || exit 1
+make install || exit 1

pkgs/graphviz/graphviz.fix

@@ -0,0 +1,19 @@
+Package(
+  [ ("name", "graphviz-1.10")
+
+  , ("build", Relative("graphviz/graphviz-build.sh"))
+
+  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.10.tar.gz")
+      , ("md5", "e1402531abff68d146bf94e72b44dc2a")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("x11", IncludeFix("xfree86/xfree86.fix"))
+  , ("zlib", IncludeFix("zlib/zlib.fix"))
+  , ("libpng", IncludeFix("libpng/libpng.fix"))
+  , ("libjpeg", IncludeFix("libjpeg/libjpeg.fix"))
+  , ("expat", IncludeFix("expat/expat.fix"))
+  , ("freetype", IncludeFix("freetype/freetype.fix"))
+  ]
+)

pkgs/gtk+-1/gtk+-build.sh

@@ -1,11 +1,11 @@
 #! /bin/sh
 
-envpkgs="$glib"
+envpkgs="$glib $x11"
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
 cd gtk+-* || exit 1
-./configure --prefix=$out --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1
+./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1
 make || exit 1
 make install || exit 1
 

pkgs/gtk+-1/gtk+.fix

@@ -9,6 +9,7 @@ Package(
       ]))
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("x11", IncludeFix("xfree86/xfree86.fix"))
   , ("glib", IncludeFix("glib-1/glib.fix"))
   ]
 )

pkgs/gtk+/gtk+-build.sh

@@ -1,12 +1,17 @@
 #! /bin/sh
 
-envpkgs="$glib $atk $pango"
+envpkgs="$glib $atk $pango $tiff $jpeg $png $x11"
 . $stdenv/setup || exit 1
 export PATH=$pkgconfig/bin:$perl/bin:$PATH
 
+# !!! abstraction problem: libtiff optionally needs libjpeg's headers.
+# idem for libpng depending on zlib
+export NIX_CFLAGS_COMPILE="-I$tiff/include -I$jpeg/include -I$png/include -I$zlib/include $NIX_CFLAGS_COMPILE"
+
 tar xvfj $src || exit 1
 cd gtk+-* || exit 1
-./configure --prefix=$out --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || 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
 

pkgs/gtk+/gtk+.fix

@@ -10,9 +10,14 @@ Package(
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
+  , ("x11", IncludeFix("xfree86/xfree86.fix"))
   , ("glib", IncludeFix("glib/glib.fix"))
   , ("atk", IncludeFix("atk/atk.fix"))
   , ("pango", IncludeFix("pango/pango.fix"))
   , ("perl", IncludeFix("perl/perl.fix"))
+  , ("tiff", IncludeFix("libtiff/libtiff.fix"))
+  , ("jpeg", IncludeFix("libjpeg/libjpeg.fix"))
+  , ("png", IncludeFix("libpng/libpng.fix"))
+  , ("zlib", IncludeFix("zlib/zlib.fix"))
   ]
 )

pkgs/gtkspell/gtkspell-build.sh

@@ -3,8 +3,7 @@
 envpkgs="$gtk $pspell"
 . $stdenv/setup || exit 1
 export PATH=$pkgconfig/bin:$PATH
-
-export C_INCLUDE_PATH=$pspell/include:$C_INCLUDE_PATH
+export NIX_CFLAGS_COMPILE="-I$pspell/include $NIX_CFLAGS_COMPILE"
 
 tar xvfz $src || exit 1
 cd gtkspell-* || exit 1

pkgs/hello/hello-build.sh

@@ -0,0 +1,9 @@
+#! /bin/sh
+
+export PATH=/usr/bin:/bin
+
+tar xvfz $src || exit 1
+cd hello-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1

pkgs/hello/hello.fix

@@ -0,0 +1,10 @@
+Package(
+  [ ("name", "hello-2.1.1")
+  , ("build", Relative("hello/hello-build.sh"))
+
+  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://ftp.gnu.org/gnu/hello/hello-2.1.1.tar.gz")
+      , ("md5", "70c9ccf9fac07f762c24f2df2290784d")
+      ]))
+  ]
+)

pkgs/libjpeg/libjpeg-build.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

pkgs/libjpeg/libjpeg.fix

@@ -0,0 +1,13 @@
+Package(
+  [ ("name", "libjpeg-6b")
+
+  , ("build", Relative("libjpeg/libjpeg-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://www.ijg.org/files/jpegsrc.v6b.tar.gz")
+      , ("md5", "dbd5f3b47ed13132f04c685d608a7547")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  ]
+)

pkgs/libpng/libpng-build.sh

@@ -0,0 +1,18 @@
+#! /bin/sh
+
+envpkgs="$zlib"
+. $stdenv/setup || exit 1
+
+export NIX_CFLAGS_COMPILE="-I$zlib/include $NIX_CFLAGS_COMPILE"
+
+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 $envpkgs > $out/envpkgs || exit 1

pkgs/libpng/libpng.fix

@@ -0,0 +1,14 @@
+Package(
+  [ ("name", "libpng-1.2.5")
+
+  , ("build", Relative("libpng/libpng-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://heanet.dl.sourceforge.net/sourceforge/png-mng/libpng-1.2.5.tar.bz2")
+      , ("md5", "3fc28af730f12ace49b14568de4ad934")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("zlib", IncludeFix("zlib/zlib.fix"))
+  ]
+)

pkgs/libtiff/libtiff-build.sh

@@ -0,0 +1,16 @@
+#! /bin/sh
+
+envpkgs="$zlib $jpeg"
+. $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 $jpeg/include" || exit 1
+make || exit 1
+mkdir $out || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1
+
+echo $envpkgs > $out/envpkgs || exit 1

pkgs/libtiff/libtiff.fix

@@ -0,0 +1,15 @@
+Package(
+  [ ("name", "libtiff-3.5.7")
+
+  , ("build", Relative("libtiff/libtiff-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.remotesensing.org/pub/libtiff/tiff-v3.5.7.tar.gz")
+      , ("md5", "82243b5ae9b7c9e492aeebc501680990")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("zlib", IncludeFix("zlib/zlib.fix"))
+  , ("jpeg", IncludeFix("libjpeg/libjpeg.fix"))
+  ]
+)

pkgs/libxml2/libxml2-build.sh

@@ -1,5 +1,6 @@
 #! /bin/sh
 
+envpkgs="$zlib"
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
@@ -8,3 +9,5 @@ cd libxml2-* || exit 1
 make || exit 1
 make install || exit 1
 strip -S $out/lib/*.a || exit 1
+
+echo $envpkgs > $out/envpkgs || exit 1

pkgs/libxml2/libxml2.fix

@@ -8,5 +8,6 @@ Package(
       ]))
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("zlib", IncludeFix("zlib/zlib.fix"))
   ]
 )

pkgs/linux-headers/linux-headers-build.sh

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

@@ -0,0 +1,13 @@
+Package(
+  [ ("name", "linux-headers-2.4.22-i386")
+
+  , ("build", Relative("linux-headers/linux-headers-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.4/linux-2.4.22.tar.bz2")
+      , ("md5", "75dc85149b06ac9432106b8941eb9f7b")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
+  ]
+)

pkgs/pan/pan-build.sh

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-envpkgs="$gtk $gtkspell $gnet $libxml"
+envpkgs="$gtk $gnet $libxml"
 . $stdenv/setup || exit 1
 export PATH=$pkgconfig/bin:$perl/bin:$PATH
 

pkgs/pango/pango-build.sh

@@ -1,12 +1,12 @@
 #! /bin/sh
 
-envpkgs="$glib $Xft"
+envpkgs="$glib $Xft $x11"
 . $stdenv/setup || exit 1
 export PATH=$pkgconfig/bin:$PATH
 
 tar xvfj $src || exit 1
 cd pango-* || exit 1
-./configure --prefix=$out --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1
+./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1
 make || exit 1
 make install || exit 1
 

pkgs/pango/pango.fix

@@ -10,6 +10,7 @@ Package(
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
+  , ("x11", IncludeFix("xfree86/xfree86.fix"))
   , ("glib", IncludeFix("glib/glib.fix"))
   , ("Xft", IncludeFix("Xft/Xft.fix"))
   ]

pkgs/perl/perl-build.sh

@@ -7,10 +7,20 @@ 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.
-grep -v '^paths=' Configure > Configure.tmp || exit 1
+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 || 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/stdenv-linux/setup-nativetools.sh

@@ -3,7 +3,9 @@ export SHELL=/bin/sh
 
 . @BASEENV@/setup
 
-export NIX_CFLAGS="-isystem @GLIBC@/include $NIX_CFLAGS"
-export NIX_LDFLAGS="-L@GLIBC@/lib -Wl,-dynamic-linker,@GLIBC@/lib/ld-linux.so.2,-rpath,@GLIBC@/lib $NIX_LDFLAGS"
+export NIX_CFLAGS_COMPILE="-isystem @GLIBC@/include $NIX_CFLAGS_COMPILE"
+export NIX_CFLAGS_LINK="-L@GLIBC@/lib $NIX_CFLAGS_LINK"
+export NIX_LDFLAGS="-dynamic-linker @GLIBC@/lib/ld-linux.so.2 -rpath @GLIBC@/lib $NIX_LDFLAGS"
 export NIX_CC=/usr/bin/gcc
 export NIX_CXX=/usr/bin/g++
+export NIX_LD=/usr/bin/ld

pkgs/stdenv-linux/setup.sh

@@ -3,7 +3,12 @@ export SHELL=@SHELL@
 
 . @BASEENV@/setup
 
-export NIX_CFLAGS="-isystem @GLIBC@/include $NIX_CFLAGS"
-export NIX_LDFLAGS="-L@GLIBC@/lib -Wl,-dynamic-linker,@GLIBC@/lib/ld-linux.so.2,-rpath,@GLIBC@/lib $NIX_LDFLAGS -L@GCC@/lib -Wl,-rpath,@GCC@/lib"
+export NIX_CFLAGS_COMPILE="-isystem @GLIBC@/include -isystem @LINUX@/include $NIX_CFLAGS_COMPILE"
+export NIX_CFLAGS_LINK="-L@GLIBC@/lib -L@GCC@/lib $NIX_CFLAGS_LINK"
+export NIX_LDFLAGS="-dynamic-linker @GLIBC@/lib/ld-linux.so.2 -rpath @GLIBC@/lib -rpath @GCC@/lib $NIX_LDFLAGS"
 export NIX_CC=@CC@
 export NIX_CXX=@CXX@
+export NIX_LD=@LD@
+
+export NIX_LIBC_INCLUDES="@GLIBC@/include"
+export NIX_LIBC_LIBS="@GLIBC@/lib"

pkgs/stdenv-linux/stdenv-build.sh

@@ -6,7 +6,7 @@ mkdir $out || exit 1
 
 p=
 first=1
-for i in $tools; do
+for i in $tools $gcc $binutils $shell; do
     if test "$first" == 1; then
 	first=
     else
@@ -17,15 +17,18 @@ done
 
 cc=$gcc/bin/gcc
 cxx=$gcc/bin/g++
+ld=$binutils/bin/ld
 shell=$shell/bin/sh
 
 echo "########## $p"
 
 sed \
  -e s^@GLIBC\@^$glibc^g \
+ -e s^@LINUX\@^$linux^g \
  -e s^@GCC\@^$gcc^g \
  -e s^@CC\@^$cc^g \
  -e s^@CXX\@^$cxx^g \
+ -e s^@LD\@^$ld^g \
  -e s^@BASEENV\@^$baseenv^g \
  -e s^@PATH\@^$p^g \
  -e s^@SHELL\@^$shell^g \

pkgs/stdenv-linux/stdenv-nativetools-build.sh

@@ -6,9 +6,5 @@ mkdir $out || exit 1
 
 sed \
  -e s^@GLIBC\@^$glibc^g \
- -e s^@CC\@^$cc^g \
- -e s^@CXX\@^$cxx^g \
  -e s^@BASEENV\@^$baseenv^g \
- -e s^@PATH\@^$p^g \
- -e s^@SHELL\@^$shell^g \
  < $setup > $out/setup || exit 1

pkgs/stdenv-linux/stdenv-nativetools.fix

@@ -1,5 +1,5 @@
 Package(
-  [ ("name", "stdenv-linux")
+  [ ("name", "stdenv-nativetools")
   , ("build", Relative("stdenv-linux/stdenv-nativetools-build.sh"))
 
   , ("setup", Relative("stdenv-linux/setup-nativetools.sh"))

pkgs/stdenv-linux/stdenv.fix

@@ -5,6 +5,7 @@ Package(
   , ("setup", Relative("stdenv-linux/setup.sh"))
   , ("baseenv", IncludeFix("baseenv/baseenv.fix"))
   , ("glibc", IncludeFix("glibc/glibc.fix"))
+  , ("linux", IncludeFix("linux-headers/linux-headers.fix"))
 
   , ("tools", 
       [ IncludeFix("coreutils/coreutils.fix")
@@ -17,11 +18,11 @@ Package(
       , IncludeFix("gzip/gzip.fix")
       , IncludeFix("bzip2/bzip2.fix")
       , IncludeFix("gnumake/gnumake.fix")
-      , IncludeFix("binutils/binutils.fix")
       , IncludeFix("bash/bash.fix")
       ])
 
-    , ("gcc", IncludeFix("gcc/gcc.fix"))
-    , ("shell", IncludeFix("bash/bash.fix"))
+  , ("gcc", IncludeFix("gcc/gcc.fix"))
+  , ("binutils", IncludeFix("binutils/binutils.fix"))
+  , ("shell", IncludeFix("bash/bash.fix"))
   ]
 )

pkgs/stdenv-native/setup.sh

@@ -0,0 +1,8 @@
+export PATH=/usr/local/bin:/usr/bin:/bin
+export SHELL=/bin/sh
+
+. @BASEENV@/setup
+
+export NIX_CC=/usr/bin/gcc
+export NIX_CXX=/usr/bin/g++
+export NIX_LD=/usr/bin/ld

pkgs/stdenv-native/stdenv-build.sh

@@ -1,26 +1,9 @@
 #! /bin/sh
 
-export PATH=/bin:/usr/bin
+export PATH=/usr/local/bin:/usr/bin:/bin
 
 mkdir $out || exit 1
-mkdir $out/bin || exit 1
-
-echo "export PATH=$out/bin:/bin:/usr/bin" >> $out/setup || exit 1
-
-gcc=/usr/bin/gcc
 
 sed \
- -e s^@GCC\@^$gcc^g \
- < $gccwrapper > $out/bin/gcc || exit 1
-chmod +x $out/bin/gcc || exit 1
-
-ln -s gcc $out/bin/cc
-
-gplusplus=/usr/bin/g++
-
-sed \
- -e s^@GCC\@^$gplusplus^g \
- < $gccwrapper > $out/bin/g++ || exit 1
-chmod +x $out/bin/g++ || exit 1
-
-ln -s g++ $out/bin/c++
+ -e s^@BASEENV\@^$baseenv^g \
+ < $setup > $out/setup || exit 1

pkgs/stdenv-native/stdenv.fix

@@ -2,6 +2,7 @@ Package(
   [ ("name", "stdenv-native")
   , ("build", Relative("stdenv-native/stdenv-build.sh"))
 
-  , ("gccwrapper", Relative("baseenv/gcc-wrapper.sh"))
+  , ("setup", Relative("stdenv-native/setup.sh"))
+  , ("baseenv", IncludeFix("baseenv/baseenv.fix"))
   ]
 )

pkgs/subversion/subversion-build.sh

@@ -14,6 +14,10 @@ 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"
+else
+    NIX_CFLAGS_COMPILE="-I$expat/include $NIX_CFLAGS_COMPILE"
+    NIX_CFLAGS_LINK="-L$expat/lib $NIX_CFLAGS_LINK"
+    NIX_LDFLAGS="-rpath $expat/lib $NIX_LDFLAGS"
 fi
 
 if test $pythonBindings; then

pkgs/subversion/subversion.fix

@@ -1,13 +1,13 @@
 Function(["localServer", "httpsClient", "httpServer", "pythonBindings"],
 
   Package(
-    [ ("name", "subversion-0.27.0")
+    [ ("name", "subversion-0.29.0")
 
     , ("build", Relative("subversion/subversion-build.sh"))
 
     , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-        [ ("url", "http://subversion.tigris.org/files/documents/15/5642/subversion-0.27.0.tar.gz")
-        , ("md5", "0f4fa0ebb0b58b83bad9433b8baa3f9a")
+        [ ("url", "http://subversion.tigris.org/files/documents/15/5977/subversion-0.29.0.tar.gz")
+        , ("md5", "5de4d92eae7ea5d83fe6c3964a08e261")
         ]))
 
     , ("localServer", Var("localServer"))
@@ -22,6 +22,7 @@ Function(["localServer", "httpsClient", "httpServer", "pythonBindings"],
     , ("httpd", If(Var("httpServer"), IncludeFix("httpd/httpd.fix"), ""))
     , ("db4", If(Var("localServer"), IncludeFix("db4/db4.fix"), ""))
     , ("libxml", IncludeFix("libxml2/libxml2.fix"))
+    , ("expat", If(Var("httpServer"), "", IncludeFix("expat/expat.fix")))
     ]
   )
 )

pkgs/system/system-template-everything.fix

@@ -9,4 +9,6 @@ Call(IncludeFix("system/system.fix"),
   , ("docbook", True)
   , ("httpd", True)
   , ("firebird", True)
+  , ("graphviz", True)
+  , ("gqview", True)
   ])

pkgs/system/system.fix

@@ -1,6 +1,6 @@
 Function(
   [ "subversion", "strategoxt", "pan", "mplayer", "sylpheed", "libxslt", "libxml"
-  ,  "docbook", "httpd", "firebird"
+  ,  "docbook", "httpd", "firebird", "graphviz", "gqview"
   ],
   Package(
     [ ("name", "system")
@@ -27,6 +27,8 @@ Function(
     , ("actDocbookXsl", If(Var("docbook"), IncludeFix("docbook-xsl/docbook-xsl.fix"), ""))
     , ("actHttpd", If(Var("httpd"), IncludeFix("httpd/httpd.fix"), ""))
     , ("actFirebird", If(Var("firebird"), IncludeFix("firebird/firebird.fix"), ""))
+    , ("actGraphviz", If(Var("graphviz"), IncludeFix("graphviz/graphviz.fix"), ""))
+    , ("actGQView", If(Var("gqview"), IncludeFix("gqview/gqview.fix"), ""))
     ]
   )
 )

pkgs/uml/config

@@ -0,0 +1,357 @@
+#
+# Automatically generated make config: don't edit
+#
+CONFIG_USERMODE=y
+# CONFIG_ISA is not set
+# CONFIG_SBUS is not set
+# CONFIG_PCI is not set
+CONFIG_UID16=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+
+#
+# General Setup
+#
+# CONFIG_MODE_SKAS is not set
+CONFIG_MODE_TT=y
+CONFIG_MODE_TT=y
+CONFIG_NET=y
+CONFIG_SYSVIPC=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_SYSCTL=y
+CONFIG_BINFMT_AOUT=y
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=y
+CONFIG_HOSTFS=y
+# CONFIG_HPPFS is not set
+CONFIG_MCONSOLE=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_HOST_2G_2G is not set
+# CONFIG_UML_SMP is not set
+# CONFIG_SMP is not set
+CONFIG_NEST_LEVEL=0
+CONFIG_KERNEL_HALF_GIGS=1
+# CONFIG_HIGHMEM is not set
+# CONFIG_PROC_MM is not set
+CONFIG_KERNEL_STACK_ORDER=2
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_KMOD=y
+
+#
+# Character Devices
+#
+CONFIG_STDIO_CONSOLE=y
+CONFIG_SSL=y
+CONFIG_FD_CHAN=y
+# CONFIG_NULL_CHAN is not set
+CONFIG_PORT_CHAN=y
+CONFIG_PTY_CHAN=y
+CONFIG_TTY_CHAN=y
+CONFIG_XTERM_CHAN=y
+CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
+CONFIG_CON_CHAN="xterm"
+CONFIG_SSL_CHAN="pty"
+CONFIG_UNIX98_PTYS=y
+CONFIG_UNIX98_PTY_COUNT=256
+# CONFIG_WATCHDOG is not set
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_UML_WATCHDOG is not set
+CONFIG_UML_SOUND=y
+CONFIG_SOUND=y
+CONFIG_HOSTAUDIO=y
+# CONFIG_TTY_LOG is not set
+
+#
+# Block Devices
+#
+CONFIG_BLK_DEV_UBD=y
+# CONFIG_BLK_DEV_UBD_SYNC is not set
+CONFIG_COW=y
+CONFIG_COW_COMMON=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_NBD=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_MMAPPER is not set
+CONFIG_NETDEVICES=y
+
+#
+# Network Devices
+#
+CONFIG_UML_NET=y
+CONFIG_UML_NET_ETHERTAP=y
+CONFIG_UML_NET_TUNTAP=y
+CONFIG_UML_NET_SLIP=y
+# CONFIG_UML_NET_SLIRP is not set
+CONFIG_UML_NET_DAEMON=y
+CONFIG_UML_NET_MCAST=y
+# CONFIG_UML_NET_PCAP is not set
+CONFIG_DUMMY=y
+CONFIG_BONDING=m
+CONFIG_EQUALIZER=m
+CONFIG_TUN=y
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+# CONFIG_PPP_FILTER is not set
+# CONFIG_PPP_ASYNC is not set
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPPOE=m
+CONFIG_SLIP=m
+# CONFIG_SLIP_COMPRESSED is not set
+# CONFIG_SLIP_SMART is not set
+# CONFIG_SLIP_MODE_SLIP6 is not set
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+# CONFIG_NETLINK_DEV is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_FILTER is not set
+CONFIG_UNIX=y
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_INET_ECN is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_IPV6 is not set
+# CONFIG_KHTTPD is not set
+# CONFIG_ATM is not set
+# CONFIG_VLAN_8021Q is not set
+
+#
+#  
+#
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+
+#
+# Appletalk devices
+#
+# CONFIG_DEV_APPLETALK is not set
+# CONFIG_DECNET is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_LLC is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_FASTROUTE is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+
+#
+# File systems
+#
+CONFIG_QUOTA=y
+# CONFIG_QFMT_V2 is not set
+CONFIG_AUTOFS_FS=m
+CONFIG_AUTOFS4_FS=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_HFS_FS=m
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EXT3_FS=y
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_UMSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_EFS_FS=m
+# CONFIG_JFFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+CONFIG_CRAMFS=m
+CONFIG_TMPFS=y
+CONFIG_RAMFS=y
+CONFIG_ISO9660_FS=y
+# CONFIG_JOLIET is not set
+# CONFIG_ZISOFS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_MINIX_FS=m
+CONFIG_VXFS_FS=m
+# CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set
+CONFIG_HPFS_FS=m
+CONFIG_PROC_FS=y
+CONFIG_DEVFS_FS=y
+CONFIG_DEVFS_MOUNT=y
+# CONFIG_DEVFS_DEBUG is not set
+CONFIG_DEVPTS_FS=y
+CONFIG_QNX4FS_FS=m
+# CONFIG_QNX4FS_RW is not set
+CONFIG_ROMFS_FS=m
+CONFIG_EXT2_FS=y
+CONFIG_SYSV_FS=m
+CONFIG_UDF_FS=m
+# CONFIG_UDF_RW is not set
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+
+#
+# Network File Systems
+#
+# CONFIG_CODA_FS is not set
+# CONFIG_INTERMEZZO_FS is not set
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_ROOT_NFS is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_TCP is not set
+CONFIG_SUNRPC=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+# CONFIG_SMB_FS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_NCPFS_PACKET_SIGNING is not set
+# CONFIG_NCPFS_IOCTL_LOCKING is not set
+# CONFIG_NCPFS_STRONG is not set
+# CONFIG_NCPFS_NFS_NS is not set
+# CONFIG_NCPFS_OS2_NS is not set
+# CONFIG_NCPFS_SMALLDOS is not set
+# CONFIG_NCPFS_NLS is not set
+# CONFIG_NCPFS_EXTRAS is not set
+# CONFIG_ZISOFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_SMB_NLS is not set
+CONFIG_NLS=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# SCSI support
+#
+CONFIG_SCSI=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+# CONFIG_BLK_DEV_SD is not set
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_DEBUG_QUEUES is not set
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+CONFIG_SCSI_DEBUG=m
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+# CONFIG_BLK_DEV_MD is not set
+# CONFIG_MD_LINEAR is not set
+# CONFIG_MD_RAID0 is not set
+# CONFIG_MD_RAID1 is not set
+# CONFIG_MD_RAID5 is not set
+# CONFIG_MD_MULTIPATH is not set
+# CONFIG_BLK_DEV_LVM is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Library routines
+#
+# CONFIG_CRC32 is not set
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
+
+#
+# Kernel hacking
+#
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUGSYM is not set
+# CONFIG_PT_PROXY is not set
+# CONFIG_GPROF is not set
+# CONFIG_GCOV is not set

pkgs/uml/uml-build.sh

@@ -0,0 +1,22 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+export PATH=$perl/bin:$m4/bin:$PATH
+
+export NIX_CC=$gcc/bin/gcc
+
+tar xvfj $linuxSrc || exit 1
+cd linux-* || exit 1
+bunzip2 < $umlSrc | $patch/bin/patch -p1 || exit 1
+cp $config .config || exit 1
+make oldconfig ARCH=um || exit 1
+
+make linux ARCH=um || exit 1
+strip linux || exit 1
+make modules ARCH=um || exit 1
+
+mkdir $out || exit 1
+mkdir $out/bin || exit 1
+cp -p linux $out/bin || exit 1
+make modules_install INSTALL_MOD_PATH=$out ARCH=um || exit 1
+

pkgs/uml/uml.fix

@@ -0,0 +1,23 @@
+Package(
+  [ ("name", "uml-2.4.22-3")
+
+  , ("build", Relative("uml/uml-build.sh"))
+  , ("config", Relative("uml/config"))
+
+  , ("linuxSrc", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.4/linux-2.4.22.tar.bz2")
+      , ("md5", "75dc85149b06ac9432106b8941eb9f7b")
+      ]))
+
+  , ("umlSrc", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://uml-pub.ists.dartmouth.edu/uml/uml-patch-2.4.22-3.bz2")
+      , ("md5", "1ffa698fed37d14c6750ec841b7d9858")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("gcc", IncludeFix("gcc-2.95/gcc.fix"))
+  , ("patch", IncludeFix("gnupatch/gnupatch.fix"))
+  , ("perl", IncludeFix("perl/perl.fix"))
+  , ("m4", IncludeFix("gnum4/gnum4.fix"))
+  ]
+)

pkgs/xfree86/host.def

@@ -0,0 +1,30 @@
+#define BuildServer		NO
+#define BuildFontServer         NO
+#define BuildSpeedo             NO
+#define BuildType1              NO
+#define BuildCID                NO
+#define BuildFreeType           NO
+#define BuildXTrueType          NO
+#define BuildFonts              NO
+#define BuildXftLibrary		NO
+#define BuildXft1Library	NO
+#define BuildClients		NO
+#define BuildDocs		NO
+#define BuildLibraries		YES
+#define BuildGLXLibrary		NO
+#define BuildOSMesaLib		NO
+#define BuildOSMesaLib		NO
+#define BuildXvMCExt		NO
+#define BuildXvMCLibrary	NO
+
+#define XF86Server              NO
+#define XnestServer             NO
+#define XVirtualFramebufferServer	NO
+#define XprtServer		NO
+#define XF86CardDrivers
+#define XInputDrivers
+
+#define ProjectRoot @OUT@
+#define NothingOutsideProjectRoot YES
+#define EtcX11Directory ProjectRoot/etc
+#define UseSeparateConfDir	NO

pkgs/xfree86/xfree86-build.sh

@@ -0,0 +1,18 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+export PATH=$bison/bin:$flex/bin:$PATH
+
+# For libfl.a (flex); assuming it's a static library. 
+export NIX_CFLAGS_LINK="-L$flex/lib $NIX_CFLAGS_LINK"
+
+tar xvfz $src1 || exit 1
+tar xvfz $src2 || exit 1
+tar xvfz $src3 || exit 1
+cd xc || exit 1
+sed "s^@OUT@^$out^" < $hostdef > config/cf/host.def
+make World || exit 1
+make install || exit 1
+
+# Hack to get fontconfig to work.
+ln -s /usr/X11R6/lib/X11/fonts $out/lib/X11/fonts

pkgs/xfree86/xfree86.fix

@@ -0,0 +1,27 @@
+Package(
+  [ ("name", "xfree86-4.3")
+
+  , ("build", Relative("xfree86/xfree86-build.sh"))
+
+  , ("src1", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://gnu.kookel.org/pub/XFree86/4.3.0/source/X430src-1.tgz")
+      , ("md5", "4f241a4f867363f40efa2b00dca292af")
+      ]))
+
+  , ("src2", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://gnu.kookel.org/pub/XFree86/4.3.0/source/X430src-2.tgz")
+      , ("md5", "844c2ee908d21dbf8911fd13115bf8b4")
+      ]))
+
+  , ("src3", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://gnu.kookel.org/pub/XFree86/4.3.0/source/X430src-3.tgz")
+      , ("md5", "b82a0443e1b7bf860e4343e6b6766cb6")
+      ]))
+
+  , ("hostdef", Relative("xfree86/host.def"))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("bison", IncludeFix("bison/bison.fix"))
+  , ("flex", IncludeFix("flex/flex.fix"))
+  ]
+)

pkgs/zlib/zlib-build.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

pkgs/zlib/zlib.fix

@@ -0,0 +1,13 @@
+Package(
+  [ ("name", "zlib-1.1.4")
+
+  , ("build", Relative("zlib/zlib-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://www.gzip.org/zlib/zlib-1.1.4.tar.gz")
+      , ("md5", "abc405d0bdd3ee22782d7aa20e440f08")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  ]
+)