* GNU hello package added.

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

ChangeLog

@@ -0,0 +1,12 @@
+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/MPlayer/MPlayer-build.sh

@@ -1,16 +1,13 @@
 #! /bin/sh
 
-export NIX_LDFLAGS=-Wl,-s
-
+envpkgs="$freetype $x11"
 . $stdenv/setup || exit 1
 
-envpkgs="$freetype"
-. $setenv || 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,12 +1,11 @@
 Package(
-  [ ("name", "MPlayer-0.90")
+  [ ("name", "MPlayer-0.91")
 
   , ("build", Relative("MPlayer/MPlayer-build.sh"))
-  , ("setenv", Relative("helpers/set-env.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"),
@@ -15,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,13 +1,11 @@
 #! /bin/sh
 
+envpkgs="$fontconfig $x11"
 . $stdenv/setup || exit 1
 
-envpkgs=$fontconfig
-. $setenv
-
 tar xvfz $src || exit 1
 cd fcpackage*/Xft || exit 1
-LDFLAGS=-Wl,-S ./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

@@ -2,7 +2,6 @@ Package(
   [ ("name", "Xft-20021121")
 
   , ("build", Relative("Xft/Xft-build.sh"))
-  , ("setenv", Relative("helpers/set-env.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
       [ ("url", "http://fontconfig.org/release/fcpackage.2_1.tar.gz")
@@ -10,6 +9,7 @@ Package(
       ]))
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("x11", IncludeFix("xfree86/xfree86.fix"))
   , ("fontconfig", IncludeFix("fontconfig/fontconfig.fix"))
   ]
 )

pkgs/asfix-tools/asfix-tools-build.sh

@@ -0,0 +1,3 @@
+#! /bin/sh
+set -e
+$pkgbuild --with-aterm=$aterm --with-sdf=$sdf2 --with-srts=$srts --with-xtc=$xtc

pkgs/asfix-tools/asfix-tools.fix

@@ -0,0 +1,19 @@
+Function(["rev"],
+  Package(
+    [ ("name", "asfix-tools")
+
+    , ("build", Relative("asfix-tools/asfix-tools-build.sh"))
+    , ("pkgbuild", Relative("strategoxt/pkg-build.sh"))
+
+    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
+                  [ ("name", "asfix-tools"), ("rev",  Var("rev"))]))
+
+    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+    , ("aterm",  IncludeFix("aterm/aterm.fix"))
+    , ("sdf2",   IncludeFix("sdf2/sdf2.fix"))
+    , ("autoxt", App(IncludeFix("autoxt/autoxt.fix"),[("rev",Var("rev"))]))
+    , ("srts",   App(IncludeFix("srts/srts.fix"),[("rev",Var("rev"))]))
+    , ("xtc",    App(IncludeFix("xtc/xtc.fix"),[("rev",Var("rev"))]))
+    ]
+  )
+)

pkgs/aterm/aterm-build.sh

@@ -1,7 +1,5 @@
 #! /bin/sh
 
-export NIX_LDFLAGS=-Wl,-s
-
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1

pkgs/atk/atk-build.sh

@@ -1,12 +1,8 @@
 #! /bin/sh
 
-export NIX_LDFLAGS=-Wl,-s
-
-. $stdenv/setup || exit 1
-
-export PATH=$pkgconfig/bin:$PATH
 envpkgs=$glib
-. $setenv || exit 1
+. $stdenv/setup || exit 1
+export PATH=$pkgconfig/bin:$perl/bin:$PATH
 
 tar xvfj $src || exit 1
 cd atk-* || exit 1

pkgs/atk/atk.fix

@@ -2,7 +2,6 @@ Package(
   [ ("name", "atk-1.2.4")
 
   , ("build", Relative("atk/atk-build.sh"))
-  , ("setenv", Relative("helpers/set-env.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
       [ ("url", "ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.4.tar.bz2")
@@ -12,5 +11,6 @@ Package(
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
   , ("glib", IncludeFix("glib/glib.fix"))
+  , ("perl", IncludeFix("perl/perl.fix"))
   ]
 )

pkgs/autoxt/autoxt-build.sh

@@ -0,0 +1,3 @@
+#! /bin/sh
+set -e
+$pkgbuild

pkgs/autoxt/autoxt.fix

@@ -0,0 +1,13 @@
+Function(["rev"],
+  Package(
+    [ ("name", "autoxt")
+
+    , ("build", Relative("strategoxt/pkg-build.sh"))
+
+    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
+                  [ ("name", "autoxt"), ("rev",  Var("rev"))]))
+
+    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+    ]
+  )
+)

pkgs/baseenv/baseenv-build.sh

@@ -0,0 +1,25 @@
+#! /bin/sh
+
+export PATH=/bin:/usr/bin
+
+mkdir $out || exit 1
+mkdir $out/bin || exit 1
+
+sed \
+ -e s^@OUT\@^$out^g \
+ < $setup > $out/setup || exit 1
+
+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
+
+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
+
+cp $ldwrapper $out/bin/ld || exit 1
+chmod +x $out/bin/ld || exit 1

pkgs/baseenv/baseenv.fix

@@ -0,0 +1,9 @@
+Package(
+  [ ("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

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

@@ -1,3 +1,7 @@
+# Add the directory containing the GCC wrappers to the PATH.
+export PATH=@OUT@/bin:$PATH
+
+# Recursively add all envpkgs to the relevant environment variables.
 addtoenv()
 {
     envpkgs="$envpkgs $1"
@@ -7,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
@@ -28,4 +33,8 @@ for i in $oldenvpkgs; do
     addtoenv $i
 done
 
-export NIX_LDFLAGS="-Wl,-rpath,$out/lib $NIX_LDFLAGS"
+# Add the output as an rpath.
+export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
+
+# Strip debug information by default.
+export NIX_STRIP_DEBUG=1

pkgs/bash/bash-build.sh

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

@@ -0,0 +1,13 @@
+Package(
+  [ ("name", "bash-2.05b")
+
+  , ("build", Relative("bash/bash-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/bash/bash-2.05b.tar.gz")
+      , ("md5", "5238251b4926d778dfe162f6ce729733")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
+  ]
+)

pkgs/binutils/binutils-build.sh

@@ -0,0 +1,15 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+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/binutils/binutils.fix

@@ -0,0 +1,13 @@
+Package(
+  [ ("name", "binutils-2.14")
+
+  , ("build", Relative("binutils/binutils-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/binutils/binutils-2.14.tar.bz2")
+      , ("md5", "2da8def15d28af3ec6af0982709ae90a")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
+  ]
+)

pkgs/bison/bison-build.sh

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

pkgs/bison/bison.fix

@@ -0,0 +1,15 @@
+Package(
+  [ ("name", "bison-1.875")
+
+  , ("build", Relative("bison/bison-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/bison/bison-1.875.tar.bz2")
+      , ("md5", "b7f8027b249ebd4dd0cc948943a71af0")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("m4", IncludeFix("gnum4/gnum4.fix"))
+  ]
+)
+

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/bzip2/bzip2-build.sh

@@ -0,0 +1,8 @@
+#! /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/bzip2/bzip2.fix

@@ -0,0 +1,13 @@
+Package(
+  [ ("name", "bzip2-1.0.2")
+
+  , ("build", Relative("bzip2/bzip2-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://sources.redhat.com/pub/bzip2/v102/bzip2-1.0.2.tar.gz")
+      , ("md5", "ee76864958d568677f03db8afad92beb")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
+  ]
+)

pkgs/coreutils/coreutils-build.sh

@@ -0,0 +1,9 @@
+#! /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/coreutils/coreutils.fix

@@ -0,0 +1,13 @@
+Package(
+  [ ("name", "coreutils-5.0")
+
+  , ("build", Relative("coreutils/coreutils-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/coreutils/coreutils-5.0.tar.bz2")
+      , ("md5", "94e5558ee2a65723d4840bfde2d323f0")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
+  ]
+)

pkgs/db4/db4-build.sh

@@ -1,7 +1,5 @@
 #! /bin/sh
 
-export NIX_LDFLAGS=-Wl,-s
-
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1

pkgs/diffutils/diffutils-build.sh

@@ -0,0 +1,9 @@
+#! /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/diffutils/diffutils.fix

@@ -0,0 +1,13 @@
+Package(
+  [ ("name", "diffutils-2.8.1")
+
+  , ("build", Relative("diffutils/diffutils-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/diffutils/diffutils-2.8.1.tar.gz")
+      , ("md5", "71f9c5ae19b60608f6c7f162da86a428")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
+  ]
+)

pkgs/docbook-xml/docbook-xml-build.sh

@@ -4,4 +4,4 @@
 
 mkdir -p $out/xml/dtd/docbook || exit 1
 cd $out/xml/dtd/docbook || exit 1
-unzip $src || exit 1
+$unzip/bin/unzip $src || exit 1

pkgs/docbook-xml/docbook-xml.fix

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

pkgs/ed/ed-build.sh

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

pkgs/ed/ed.fix

@@ -0,0 +1,13 @@
+Package(
+  [ ("name", "ed-0.2")
+
+  , ("build", Relative("ed/ed-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.gnu.org/pub/gnu/ed/ed-0.2.tar.gz")
+      , ("md5", "ddd57463774cae9b50e70cd51221281b")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  ]
+)

pkgs/expat/expat-build.sh

@@ -1,7 +1,5 @@
 #! /bin/sh
 
-export NIX_LDFLAGS=-Wl,-s
-
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1

pkgs/fetchsvn/fetchsvn-native.fix

@@ -0,0 +1,10 @@
+Function(["name","url","dir","rev"],
+  Package(
+    [ ("name", Var("name"))
+    , ("build", Relative("fetchsvn/fetchsvn.sh"))
+    , ("url",   Var("url"))
+    , ("dir",   Var("dir"))
+    , ("rev",   Var("rev"))
+    ]
+  )
+)

pkgs/fetchsvn/fetchsvn.fix

@@ -0,0 +1,17 @@
+Function(["name","url","dir","rev"],
+  Package(
+    [ ("name", Var("name"))
+    , ("build", Relative("fetchsvn/fetchsvn.sh"))
+    , ("url",   Var("url"))
+    , ("dir",   Var("dir"))
+    , ("rev",   Var("rev"))
+
+    , ("svn", Call(IncludeFix("subversion/subversion.fix"), 
+        [ ("localServer", True)
+        , ("httpsClient", True)
+        , ("httpServer", True)
+        , ("pythonBindings", True)
+        ]))
+    ]
+  )
+)

pkgs/fetchsvn/fetchsvn.sh

@@ -0,0 +1,17 @@
+#! /bin/sh
+
+set -e
+
+echo "exporting svn repository $url/$dir (at rev $rev) into $out..."
+
+svn export -r $rev $url/$dir $dir
+
+# touch bootstrapped sources because subversion doesn't sets the mtime of files
+# to checkout time, not to the last mtime in the repository.
+MTIME=`date +%Y%m%d%H%M.%S`
+echo "** INFO -- Modification time: $MTIME"
+find $dir -print | xargs touch -t $MTIME
+# end of touch
+
+mkdir $out
+tar zcf $out/$dir.tar.gz $dir

pkgs/findutils/findutils-build.sh

@@ -0,0 +1,9 @@
+#! /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/findutils/findutils.fix

@@ -0,0 +1,13 @@
+Package(
+  [ ("name", "findutils-4.1.20")
+
+  , ("build", Relative("findutils/findutils-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://alpha.gnu.org/pub/gnu/findutils/findutils-4.1.20.tar.gz")
+      , ("md5", "e90ce7222daadeb8616b8db461e17cbc")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
+  ]
+)

pkgs/firebird/firebird-build.sh

@@ -0,0 +1,32 @@
+#! /bin/sh
+
+envpkgs="$gtk $libIDL"
+. $stdenv/setup || exit 1
+export PATH=$pkgconfig/bin:$perl/bin:$zip/bin:$unzip/bin:$PATH
+
+tar xvfj $src || exit 1
+cd mozilla || exit 1
+
+cat > .mozconfig <<EOF
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
+ac_add_options --enable-crypto
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+ac_add_options --disable-mailnews
+ac_add_options --disable-composer
+ac_add_options --enable-optimize=-O2
+ac_add_options --disable-ldap
+ac_add_options --disable-mailnews
+ac_add_options --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help
+ac_add_options --enable-xft
+ac_add_options --enable-swg
+ac_add_options --enable-strip
+ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --disable-pedantic
+EOF
+echo "ac_add_options --prefix=$out" >> .mozconfig
+
+./configure || exit 1
+make -f client.mk build || exit 1
+make install || exit 1

pkgs/firebird/firebird.fix

@@ -0,0 +1,19 @@
+Package(
+  [ ("name", "firebird-0.6.1")
+
+  , ("build", Relative("firebird/firebird-build.sh"))
+
+  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://ftp.mozilla.org/pub/firebird/releases/0.6.1/MozillaFirebird-source-0.6.1.tar.bz2")
+      , ("md5", "35191de0d02601f7a190b5065a26de85")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
+  , ("gtk", IncludeFix("gtk+/gtk+.fix"))
+  , ("perl", IncludeFix("perl/perl.fix"))
+  , ("zip", IncludeFix("zip/zip.fix"))
+  , ("unzip", IncludeFix("unzip/unzip.fix"))
+  , ("libIDL", IncludeFix("libIDL/libIDL.fix"))
+  ]
+)

pkgs/flex/flex-build.sh

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

pkgs/flex/flex.fix

@@ -0,0 +1,15 @@
+Package(
+  [ ("name", "flex-2.5.4a")
+
+  , ("build", Relative("flex/flex-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/flex/flex-2.5.4a.tar.gz")
+      , ("md5", "bd8753d0b22e1f4ec87a553a73021adf")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("yacc", IncludeFix("bison/bison.fix"))
+  ]
+)
+

pkgs/fontconfig/fontconfig-build.sh

@@ -1,16 +1,17 @@
 #! /bin/sh
 
-export NIX_LDFLAGS=-Wl,-s
-
+envpkgs="$freetype $expat $x11"
 . $stdenv/setup || exit 1
+export PATH=$ed/bin:$PATH
 
-envpkgs="$freetype $expat"
-. $setenv || 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 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

@@ -2,7 +2,6 @@ Package(
   [ ("name", "fontconfig-20021121")
 
   , ("build", Relative("fontconfig/fontconfig-build.sh"))
-  , ("setenv", Relative("helpers/set-env.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
       [ ("url", "http://fontconfig.org/release/fcpackage.2_1.tar.gz")
@@ -10,7 +9,9 @@ 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/freetype/freetype-build.sh

@@ -1,7 +1,5 @@
 #! /bin/sh
 
-export NIX_LDFLAGS=-Wl,-s
-
 . $stdenv/setup || exit 1
 
 tar xvfj $src || exit 1

pkgs/gawk/gawk-build.sh

@@ -0,0 +1,9 @@
+#! /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/gawk/gawk.fix

@@ -0,0 +1,13 @@
+Package(
+  [ ("name", "gawk-3.1.3")
+
+  , ("build", Relative("gawk/gawk-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/gawk/gawk-3.1.3.tar.bz2")
+      , ("md5", "a116eec17e7ba085febb74c7758823bd")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.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

@@ -0,0 +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

@@ -0,0 +1,15 @@
+Package(
+  [ ("name", "gcc-3.3.1")
+
+  , ("build", Relative("gcc/gcc-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-3.3.1/gcc-3.3.1.tar.bz2")
+      , ("md5", "1135a104e9fa36fdf7c663598fab5c40")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
+  , ("binutils", IncludeFix("binutils/binutils.fix"))
+  , ("linux", IncludeFix("linux-headers/linux-headers.fix"))
+  ]
+)

pkgs/getopt/getopt-build.sh

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

pkgs/getopt/getopt.fix

@@ -0,0 +1,14 @@
+Package(
+  [ ("name", "getopt-1.1.3")
+
+  , ("build", Relative("getopt/getopt-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://huizen.dds.nl/~frodol/getopt-1.1.3.tar.gz")
+      , ("md5", "7b7637dcb0ac531f1af29f4d6b018e86")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  ]
+)
+

pkgs/gettext/gettext-build.sh

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

pkgs/gettext/gettext.fix

@@ -0,0 +1,13 @@
+Package(
+  [ ("name", "gettext-0.12.1")
+
+  , ("build", Relative("gettext/gettext-build.sh"))
+
+  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/gettext/gettext-0.12.1.tar.gz")
+      , ("md5", "5d4bddd300072315e668247e5b7d5bdb")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  ]
+)

pkgs/glib-1/glib-build.sh

@@ -1,7 +1,5 @@
 #! /bin/sh
 
-export NIX_LDFLAGS=-Wl,-s
-
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1

pkgs/glib/glib-build.sh

@@ -1,10 +1,7 @@
 #! /bin/sh
 
-export NIX_LDFLAGS=-Wl,-s
-
 . $stdenv/setup || exit 1
-
-export PATH=$pkgconfig/bin:$PATH
+export PATH=$pkgconfig/bin:$gettext/bin:$perl/bin:$PATH
 
 tar xvfj $src || exit 1
 cd glib-* || exit 1

pkgs/glib/glib.fix

@@ -10,5 +10,7 @@ Package(
 
   , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
   , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
+  , ("gettext", IncludeFix("gettext/gettext.fix"))
+  , ("perl", IncludeFix("perl/perl.fix"))
   ]
 )

pkgs/gnet/gnet-build.sh

@@ -1,12 +1,8 @@
 #! /bin/sh
 
-export NIX_LDFLAGS=-Wl,-s
-
+envpkgs="$glib"
 . $stdenv/setup || exit 1
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-envpkgs=$glib
-. $setenv || exit 1
+export PATH=$pkgconfig/bin:$PATH
 
 tar xvfz $src || exit 1
 cd gnet-* || exit 1

pkgs/gnet/gnet.fix

@@ -2,7 +2,6 @@ Package(
   [ ("name", "gnet-1.1.9")
 
   , ("build", Relative("gnet/gnet-build.sh"))
-  , ("setenv", Relative("helpers/set-env.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
       [ ("url", "http://www.gnetlibrary.org/src/gnet-1.1.9.tar.gz")

pkgs/gnugrep/gnugrep-build.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+envpkgs="$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/gnugrep/gnugrep.fix

@@ -0,0 +1,14 @@
+Package(
+  [ ("name", "gnugrep-2.5.1")
+
+  , ("build", Relative("gnugrep/gnugrep-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/grep/grep-2.5.1.tar.bz2")
+      , ("md5", "ddd99e2d5d4f4611357e31e97f080cf2")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
+  , ("pcre", IncludeFix("pcre/pcre.fix"))
+  ]
+)

pkgs/gnum4/gnum4-build.sh

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

pkgs/gnum4/gnum4.fix

@@ -0,0 +1,13 @@
+Package(
+  [ ("name", "gnum4-1.4")
+
+  , ("build", Relative("gnum4/gnum4-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/m4/m4-1.4.tar.gz")
+      , ("md5", "9eb2dd07740b2d2f3c7adb3e8d299bda")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  ]
+)

pkgs/gnumake/gnumake-build.sh

@@ -0,0 +1,9 @@
+#! /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/gnumake/gnumake.fix

@@ -0,0 +1,13 @@
+Package(
+  [ ("name", "gnumake-3.80")
+
+  , ("build", Relative("gnumake/gnumake-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/make/make-3.80.tar.bz2")
+      , ("md5", "0bbd1df101bc0294d440471e50feca71")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.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/gnused/gnused-build.sh

@@ -0,0 +1,9 @@
+#! /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/gnused/gnused.fix

@@ -0,0 +1,13 @@
+Package(
+  [ ("name", "gnused-4.0.7")
+
+  , ("build", Relative("gnused/gnused-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/sed/sed-4.0.7.tar.gz")
+      , ("md5", "005738e7f97bd77d95b6907156c8202a")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
+  ]
+)

pkgs/gnutar/gnutar-build.sh

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

pkgs/gnutar/gnutar.fix

@@ -0,0 +1,13 @@
+Package(
+  [ ("name", "gnutar-1.13.25")
+
+  , ("build", Relative("gnutar/gnutar-build.sh"))
+
+  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://alpha.gnu.org/gnu/tar/tar-1.13.25.tar.gz")
+      , ("md5", "6ef8c906e81eee441f8335652670ac4a")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
+  ]
+)

pkgs/gpp/gpp-build.sh

@@ -0,0 +1,4 @@
+#! /bin/sh
+set -e
+$pkgbuild --with-aterm=$aterm --with-sdf=$sdf2 --with-srts=$srts --with-xtc=$xtc \
+    --with-stratego-front=$stratego_front

pkgs/gpp/gpp.fix

@@ -0,0 +1,21 @@
+Function(["rev"],
+  Package(
+    [ ("name", "gpp")
+
+    , ("build", Relative("gpp/gpp-build.sh"))
+    , ("pkgbuild", Relative("strategoxt/pkg-build.sh"))
+
+    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
+                  [ ("name", "gpp"), ("rev",  Var("rev"))]))
+
+    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+    , ("aterm",  IncludeFix("aterm/aterm.fix"))
+    , ("sdf2",   IncludeFix("sdf2/sdf2.fix"))
+    , ("autoxt", App(IncludeFix("autoxt/autoxt.fix"),[("rev",Var("rev"))]))
+    , ("srts",   App(IncludeFix("srts/srts.fix"),[("rev",Var("rev"))]))
+    , ("xtc",    App(IncludeFix("xtc/xtc.fix"),[("rev",Var("rev"))]))
+    , ("stratego_front",    
+	App(IncludeFix("stratego-front/stratego-front.fix"),[("rev",Var("rev"))]))
+    ]
+  )
+)

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,15 +1,11 @@
 #! /bin/sh
 
-export NIX_LDFLAGS=-Wl,-s
-
+envpkgs="$glib $x11"
 . $stdenv/setup || exit 1
 
-envpkgs="$glib"
-. $setenv || 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

@@ -2,7 +2,6 @@ Package(
   [ ("name", "gtk+-1.2.10")
 
   , ("build", Relative("gtk+-1/gtk+-build.sh"))
-  , ("setenv", Relative("helpers/set-env.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
       [ ("url", "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz")
@@ -10,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,16 +1,17 @@
 #! /bin/sh
 
-export NIX_LDFLAGS=-Wl,-s
-
+envpkgs="$glib $atk $pango $tiff $jpeg $png $x11"
 . $stdenv/setup || exit 1
+export PATH=$pkgconfig/bin:$perl/bin:$PATH
 
-export PATH=$pkgconfig/bin:$PATH
-envpkgs="$glib $atk $pango"
-. $setenv || exit 1
+# !!! 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

@@ -2,7 +2,6 @@ Package(
   [ ("name", "gtk+-2.2.2")
 
   , ("build", Relative("gtk+/gtk+-build.sh"))
-  , ("setenv", Relative("helpers/set-env.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
       [ ("url", "ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.2.tar.bz2")
@@ -11,8 +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

@@ -1,14 +1,9 @@
 #! /bin/sh
 
-export NIX_LDFLAGS=-Wl,-s
-
-. $stdenv/setup || exit 1
-
-export PATH=$pkgconfig/bin:$PATH
 envpkgs="$gtk $pspell"
-. $setenv || exit 1
-
-export C_INCLUDE_PATH=$pspell/include:$C_INCLUDE_PATH
+. $stdenv/setup || exit 1
+export PATH=$pkgconfig/bin:$PATH
+export NIX_CFLAGS_COMPILE="-I$pspell/include $NIX_CFLAGS_COMPILE"
 
 tar xvfz $src || exit 1
 cd gtkspell-* || exit 1

pkgs/gtkspell/gtkspell.fix

@@ -2,7 +2,6 @@ Package(
   [ ("name", "gtkspell-2.0.4")
 
   , ("build", Relative("gtkspell/gtkspell-build.sh"))
-  , ("setenv", Relative("helpers/set-env.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
       [ ("url", "http://gtkspell.sourceforge.net/download/gtkspell-2.0.4.tar.gz")

pkgs/gzip/gzip-build.sh

@@ -0,0 +1,9 @@
+#! /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/gzip/gzip.fix

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

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/httpd/httpd-build.sh

@@ -1,11 +1,8 @@
 #! /bin/sh
 
-export NIX_LDFLAGS=-Wl,-s
-
-. $stdenv/setup || exit 1
-
 envpkgs="$ssl $db4 $expat"
-. $setenv || exit 1
+. $stdenv/setup || exit 1
+export PATH=$perl/bin:$PATH
 
 tar xvfz $src || exit 1
 cd httpd-* || exit 1

pkgs/httpd/httpd.fix

@@ -2,7 +2,6 @@ Package(
   [ ("name", "httpd-2.0.47")
 
   , ("build", Relative("httpd/httpd-build.sh"))
-  , ("setenv", Relative("helpers/set-env.sh"))
 
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
       [ ("url", "http://apache.cs.uu.nl/dist/httpd/httpd-2.0.47.tar.gz")
@@ -13,5 +12,6 @@ Package(
   , ("ssl", IncludeFix("openssl/openssl.fix"))
   , ("db4", IncludeFix("db4/db4.fix"))
   , ("expat", IncludeFix("expat/expat.fix"))
+  , ("perl", IncludeFix("perl/perl.fix"))
   ]
 )

pkgs/libIDL/libIDL-build.sh

@@ -0,0 +1,14 @@
+#! /bin/sh
+
+envpkgs="$glib"
+. $stdenv/setup || exit 1
+export PATH=$pkgconfig/bin:$lex/bin:$yacc/bin:$PATH
+
+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
+
+echo $envpkgs > $out/envpkgs || exit 1

pkgs/libIDL/libIDL.fix

@@ -0,0 +1,17 @@
+Package(
+  [ ("name", "libIDL-0.8.2")
+
+  , ("build", Relative("libIDL/libIDL-build.sh"))
+
+  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "ftp://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2")
+      , ("md5", "a75d2dbf3a3c66b567047c94245f8b82")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
+  , ("glib", IncludeFix("glib/glib.fix"))
+  , ("lex", IncludeFix("flex/flex.fix"))
+  , ("yacc", IncludeFix("bison/bison.fix"))
+  ]
+)

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"))
+  ]
+)