* Doh! Evacuate sources.

svn path=/nixpkgs/branches/0.7-release/; revision=2396

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.
-

NEWS

@@ -0,0 +1,37 @@
+Nix Packages 0.7
+
+* The bootstrap process for the standard build environment on Linux
+  (stdenv-linux) has been improved.  It is no longer dependent in its
+  initial bootstrap stages on the system Glibc, GCC, and other tools.
+  Rather, Nixpkgs contains a statically linked bash and curl, and uses
+  that to download other statically linked tools.  These are then used
+  to build a Glibc and dynamically linked versions of all other
+  tools.
+
+  This change also makes the bootstrap process faster.  For instance,
+  GCC is built only once instead of three times.
+
+  (Contributed by Armijn Hemel.)
+
+* Tarballs used by Nixpkgs are now obtained from the same server that
+  hosts Nixpkgs (catamaran.labs.cs.uu.nl).  This reduces the risk of
+  packages being unbuildable due to moved or deleted files on various
+  servers.
+
+* There now is a generic mechanism for building Perl modules.  See the
+  various Perl modules defined in pkgs/system/all-packages-generic.nix.
+    
+* Notable new packages:
+
+  - Qt 3
+  - MySQL
+  - MythTV
+  - Mono
+  - MonoDevelop (alpha)
+  - Xine
+
+* Notable updates:
+
+  - GCC 3.4.3
+  - Glibc 2.3.4
+  - GTK 2.6

STABLE

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

VERSION

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

maintainers/docs/bugs.txt

@@ -0,0 +1,55 @@
+* 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...)
+    ...
+
+
+* 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)
+
+
+* `ld' on Mac OS X barfs if the timestamp on static libraries has
+  changed (which happens if they are installed through a substitute).
+
+  Typical error:
+
+  /usr/bin/ld: table of contents for archive: libATerm.a is out of
+  date; rerun ranlib(1) (can't load from it)
+
+  Solution: patch ld.
+
+  Non-solution: extend NAR file format to include timestamps.  We
+  don't want that because they introduce a source of non-determinism.
+  To catch problems like this one determistically, we should change
+  the timestamp on store objects to 0.
+
+
+* In gtksourceview-sharp: does the prefix patch cause problems (e.g.,
+  makefile.am says "mimeinfodir should be the same as the gnome
+  prefix")?

maintainers/docs/classification.txt

@@ -0,0 +1,113 @@
+* Classification scheme for packages
+
+- many packages fall under several categories; what matters is the
+  *primary* purpose of a package.  For example, the libxml2 package
+  builds both a library and some tools; but it's a library foremost,
+  so it goes under ./development/libraries. 
+
+- when in doubt, refactor.
+
+IF it's used to support SOFTWARE DEVELOPMENT:
+
+  IF it's a LIBRARY used by other packages:
+    IF it's directly related to GTK:
+      ./development/libraries/gtk+
+    ELSE
+      ./development/libraries
+      (e.g., libxml2)
+  ELSE IF it's a COMPILER:
+    ./development/compilers
+    (e.g., gcc)
+  ELSE IF it's an INTERPRETER:
+    ./development/interpreters
+  ELSE IF it's a development TOOL (or set of):
+    IF it's a PARSER GENERATOR (incl. lexers):
+      ./development/tools/parsing
+      (e.g., bison, flex)
+    ELSE IF it's a BUILD MANAGER:
+      ./development/tools/build-managers
+      (e.g., gnumake
+    ELSE
+      ./development/tools/misc
+      (e.g., binutils)
+  ELSE
+    ./development/misc
+
+ELSE IF it's a TOOL (or set of):
+  # a tool is a relatively *small* program, esp. one intented to be
+  # used non-interactively
+
+  IF it's for NETWORKING:
+    ./tools/networking
+    (e.g., wget)
+  ELSE IF it's for TEXT PROCESSING:
+    ./tools/text
+    (e.g., diffutils)
+  ELSE IF it's a SYSTEM utility, i.e., something related or essential
+    to the operation of a system:
+    ./tools/system
+    (e.g., init)
+  ELSE IF it's an ARCHIVER (which may include a compression function):
+    ./tools/archivers
+    (e.g., zip, tar)
+  ELSE IF it's a COMPRESSION program:
+    ./tools/compression
+    (e.g., gzip, bzip2)
+  ELSE
+    ./tools/misc
+
+ELSE IF it's a SHELL:
+
+  ./shells
+
+ELSE IF it's a SERVER:
+
+  IF it's a HTTP server:
+    ./servers/http
+    (e.g., apache)
+  IF it's a X11 server:
+    ./servers/x11
+    (e.g., xfree86)
+  ELSE
+    ./servers/misc
+
+ELSE IF it's a DESKTOP ENVIRONMENT (incl. WINDOW MANAGERS):
+
+  ./desktops
+  (e.g., kde, gnome, fvwm)
+
+ELSE IF it's an APPLICATION:
+  # a (typically large) program with a distinct user interface,
+  # primarily used interactively
+
+  IF it's a VERSION MANAGEMENT system:
+    ./applications/version-management
+  ELSE IF it's for VIDEO playback/etc:
+    ./applications/video
+  ELSE IF it's for GRAPHICS viewing/editing/etc:
+    ./applications/graphics
+  ELSE IF it's for NETWORKING:
+    IF it's a MAILREADER:
+      ./applications/networking/mailreaders
+    IF it's a NEWSREADER:
+      ./applications/networking/newsreaders
+    ELSE
+      ./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

maintainers/docs/todo.txt

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

maintainers/scripts/evacuate-urls.sh

@@ -0,0 +1,28 @@
+#! /bin/sh -e
+
+find . -name "*.nix" | while read fn; do
+
+    grep -E '^ *url = ' "$fn" | while read line; do
+
+        if oldURL=$(echo "$line" | sed 's^url = \(.*\);^\1^'); then
+
+            if ! echo "$oldURL" | grep -q -E ".cs.uu.nl|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer"; then
+                base=$(basename $oldURL)
+                newURL="http://catamaran.labs.cs.uu.nl/dist/tarballs/$base"
+                newPath="/mnt/scratchy/eelco/public_html/tarballs/$base"
+                echo "$fn: $oldURL -> $newURL"
+
+                if ! test -e "$newPath"; then
+                    curl --fail --location --max-redirs 20 "$oldURL" > "$newPath".tmp
+                    mv -f "$newPath".tmp "$newPath"
+                fi
+
+                sed "s^$oldURL^$newURL^" < "$fn" > "$fn".tmp
+                mv -f "$fn".tmp "$fn"
+            fi
+            
+        fi
+    
+    done
+
+done

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-0.91")
-
-  , ("build", Relative("MPlayer/MPlayer-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-0.91.tar.bz2")
-      , ("md5", "bb09138564ddf954392d20dbc4b88ebd")
-      ]))
-
-  , ("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/Xft/Xft-build.sh

@@ -1,11 +0,0 @@
-#! /bin/sh
-
-envpkgs="$fontconfig $x11"
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd fcpackage*/Xft || 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

@@ -1,15 +0,0 @@
-Package(
-  [ ("name", "Xft-20021121")
-
-  , ("build", Relative("Xft/Xft-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://fontconfig.org/release/fcpackage.2_1.tar.gz")
-      , ("md5", "2f2852c80924a9b5356c3037a471c1a1")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("x11", IncludeFix("xfree86/xfree86.fix"))
-  , ("fontconfig", IncludeFix("fontconfig/fontconfig.fix"))
-  ]
-)

pkgs/applications/audio/cdparanoia/default.nix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "cdparanoia-III-alpha9.8";
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/cdparanoia-III-alpha9.8.src.tgz;
+    md5 = "7218e778b5970a86c958e597f952f193" ;
+  };
+  
+  patches = [./fix.patch];
+}

pkgs/applications/audio/cdparanoia/fix.patch

@@ -0,0 +1,46 @@
+*** cdparanoia-III-alpha9.8/interface/utils.h	Thu Apr 20 00:41:04 2000
+--- cdparanoia-III-alpha9.8-old/interface/utils.h	Wed Jan 19 21:44:08 2005
+***************
+*** 110,117 ****
+      case CDDA_MESSAGE_LOGIT:
+        d->errorbuf=catstring(d->errorbuf,s);
+        break;
+-     case CDDA_MESSAGE_FORGETIT:
+-     default:
+      }
+    }
+  }
+--- 110,115 ----
+***************
+*** 125,132 ****
+      case CDDA_MESSAGE_LOGIT:
+        d->messagebuf=catstring(d->messagebuf,s);
+        break;
+-     case CDDA_MESSAGE_FORGETIT:
+-     default:
+      }
+    }
+  }
+--- 123,128 ----
+***************
+*** 167,174 ****
+  	}
+        }
+        break;
+-     case CDDA_MESSAGE_FORGETIT:
+-     default:
+      }
+    }
+    if(malloced)free(buffer);
+--- 163,168 ----
+***************
+*** 203,210 ****
+  	if(!malloced)*messages=catstring(*messages,"\n");
+  	}
+        break;
+-     case CDDA_MESSAGE_FORGETIT:
+-     default:
+      }
+    }
+    if(malloced)free(buffer);
+--- 197,202 ----

pkgs/applications/audio/flac/default.nix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl, libogg}:
+
+stdenv.mkDerivation {
+  name = "flac-1.1.1";
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/flac-1.1.1.tar.gz;
+    md5 = "c6ccddccf8ad344065698047c2fc7280" ;
+  };
+
+  buildInputs = [libogg] ;
+}

pkgs/applications/audio/lame/default.nix

@@ -0,0 +1,9 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "lame-3.96.1";
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/lame-3.96.1.tar.gz;
+    md5 = "e1206c46a5e276feca11a7149e2fc6ac" ;
+  };
+}

pkgs/applications/editors/eclipse/builder.sh

@@ -0,0 +1,7 @@
+set -e
+
+. $stdenv/setup
+
+$unzip/bin/unzip $src 
+mkdir $out
+mv eclipse $out/

pkgs/applications/editors/eclipse/default.nix

@@ -0,0 +1,17 @@
+{fetchurl, stdenv, unzip}:
+
+let {
+  body =
+    stdenv.mkDerivation {
+      name = "eclipse-sdk-3.0.1";
+      builder = ./builder.sh;
+      src = bindist;
+      inherit unzip;
+   };
+
+  bindist = 
+    fetchurl {
+      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/eclipse-SDK-3.0.1-linux-gtk.zip;
+      md5 = "d0f743c972adf13e71a43b2dc6c9c55b";
+    };
+}

pkgs/applications/editors/emacs/builder.sh

@@ -0,0 +1,13 @@
+. $stdenv/setup
+
+myglibc=`cat ${NIX_GCC}/nix-support/orig-glibc`
+echo "glibc: $myglibc" 
+
+postConfigure() {
+  cp $myglibc/lib/crt1.o src
+  cp $myglibc/lib/crti.o src
+  cp $myglibc/lib/crtn.o src
+}
+postConfigure=postConfigure
+
+genericBuild

pkgs/applications/editors/emacs/default.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, xlibs}:
+
+stdenv.mkDerivation {
+  name = "emacs-21.3";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/emacs-21.3.tar.gz;
+    md5 = "a0bab457cbf5b4f8eb99d1d0a3ada420";
+  };
+  patches = [./patchfile];
+  inherit (xlibs) libXaw libX11;
+
+  buildInputs = [xlibs.libXaw xlibs.libX11];
+}

pkgs/applications/editors/emacs/modes/cua/builder.sh

@@ -0,0 +1,4 @@
+. $stdenv/setup
+
+mkdir -p $out/emacs/site-lisp
+cp $src $out/emacs/site-lisp/cua.el

pkgs/applications/editors/emacs/modes/cua/default.nix

@@ -0,0 +1,8 @@
+{stdenv, fetchurl}: stdenv.mkDerivation {
+  name = "cua-mode-2.10";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/cua-mode-2.10.el;
+    md5 = "5bf5e43f5f38c8383868c7c6c5baca09";
+  };
+}

pkgs/applications/editors/emacs/modes/haskell/builder.sh

@@ -0,0 +1,6 @@
+. $stdenv/setup
+
+mkdir -p $out/emacs/site-lisp
+tar zxvf $src
+cp haskell-mode*/*.el $out/emacs/site-lisp
+cp haskell-mode*/*.hs $out/emacs/site-lisp

pkgs/applications/editors/emacs/modes/haskell/default.nix

@@ -0,0 +1,8 @@
+{stdenv, fetchurl}: stdenv.mkDerivation {
+  name = "haskell-mode-1.45";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/haskell-mode-1.45.tar.gz;
+    md5 = "c609998580cdb9ca8888c7d47d22ca3b";
+  };
+}

pkgs/applications/editors/emacs/modes/nxml/builder.sh

@@ -0,0 +1,7 @@
+. $stdenv/setup
+
+mkdir -p $out/emacs/site-lisp
+cd $out/emacs/site-lisp
+tar xvfz $src
+mv nxml-mode-*/* .
+rmdir nxml-mode-*

pkgs/applications/editors/emacs/modes/nxml/default.nix

@@ -0,0 +1,8 @@
+{stdenv, fetchurl}: stdenv.mkDerivation {
+  name = "nxml-mode-20041004";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/nxml-mode-20041004.tar.gz;
+    md5 = "ac137024cf337d6f11d8ab278d39b4db";
+  };
+}

pkgs/applications/editors/emacs/patchfile

@@ -0,0 +1,41 @@
+Only in emacs-21.3: configure.in~
+Only in emacs-21.3: patchfile
+Only in emacs-21.3/src: Makefile.in~
+diff -rc emacs-orig/src/s/gnu-linux.h emacs-21.3/src/s/gnu-linux.h
+*** emacs-orig/src/s/gnu-linux.h	2001-09-28 17:50:04.000000000 +0200
+--- emacs-21.3/src/s/gnu-linux.h	2004-10-06 13:13:19.000000000 +0200
+***************
+*** 173,179 ****
+  /* GNU/Linux usually has crt0.o in a non-standard place */
+  #define START_FILES pre-crt0.o /usr/lib/crt0.o
+  #else
+! #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
+  #endif
+  
+  #ifdef __ELF__
+--- 173,179 ----
+  /* GNU/Linux usually has crt0.o in a non-standard place */
+  #define START_FILES pre-crt0.o /usr/lib/crt0.o
+  #else
+! #define START_FILES pre-crt0.o crt1.o crti.o
+  #endif
+  
+  #ifdef __ELF__
+***************
+*** 225,231 ****
+  #else
+  #undef LIB_GCC
+  #define LIB_GCC
+! #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
+  #endif
+  
+  /* Don't use -g in test compiles in configure.
+--- 225,231 ----
+  #else
+  #undef LIB_GCC
+  #define LIB_GCC
+! #define LIB_STANDARD -lgcc -lc -lgcc crtn.o
+  #endif
+  
+  /* Don't use -g in test compiles in configure.
+Only in emacs-21.3/src/s: gnu-linux.h~

pkgs/applications/editors/monodevelop/builder.sh

@@ -0,0 +1,29 @@
+. $stdenv/setup
+. $makeWrapper
+
+export MONO_GAC_PREFIX=$monodoc:$gtksharp
+
+postInstall=postInstall
+postInstall() {
+    mv $out/bin $out/bin-orig
+    mkdir $out/bin
+
+    moz=$(ls $mozilla/lib/*/libgtkembedmoz.so)
+
+    for i in $out/bin-orig/*; do
+        echo "wrapping $(basename $i)"
+        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
+        makeWrapper "$i" "$out/bin/$(basename $i)" \
+            --suffix PATH ':' "$(dirname $(type -p mono))" \
+            --suffix PATH ':' "$(dirname $(type -p mono))" \
+            --suffix LD_LIBRARY_PATH ':' "$gtksharp/lib" \
+            --suffix MONO_GAC_PREFIX ':' "$gtksharp" \
+            --suffix MONO_GAC_PREFIX ':' "$gtkmozembedsharp" \
+            --suffix MONO_GAC_PREFIX ':' "$gtksourceviewsharp" \
+            --suffix MONO_GAC_PREFIX ':' "$monodoc" \
+            --set MOZILLA_FIVE_HOME "$(dirname $moz)"
+    done
+}
+
+genericBuild
+

pkgs/applications/editors/monodevelop/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, file, mono, gtksharp, gtksourceviewsharp
+, gtkmozembedsharp, monodoc
+, perl, perlXMLParser, pkgconfig
+, glib, gtk, gconf, gnomevfs, libbonobo, libglade, libgnome
+, mozilla
+}:
+
+stdenv.mkDerivation {
+  name = "monodevelop-0.6-pre2315";
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = http://losser.labs.cs.uu.nl/~eelco/mono-tmp/monodevelop-0.6-pre2315.tar.bz2;
+    md5 = "8c33df5629b0676b7ab552854c1de6fd";
+  };
+
+  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
+  
+  patches = [./prefix.patch];
+  
+  buildInputs = [
+    file mono gtksharp gtksourceviewsharp perl perlXMLParser pkgconfig
+    glib gtk gconf gnomevfs libbonobo libglade libgnome
+    gtkmozembedsharp monodoc
+  ];
+  
+  inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp;
+}

pkgs/applications/editors/monodevelop/prefix.patch

@@ -0,0 +1,44 @@
+diff -rc MonoDevelop-orig/Makefile.in MonoDevelop/Makefile.in
+*** MonoDevelop-orig/Makefile.in	2005-03-09 17:43:58.000000000 +0100
+--- MonoDevelop/Makefile.in	2005-03-09 18:10:20.000000000 +0100
+***************
+*** 298,304 ****
+  # (mkdir ../../build/bin/ hack)
+  SUBDIRS = Core build po Extras
+  bin_SCRIPTS = monodevelop
+! gnome_data = @gnome_prefix@/share
+  desktopdir = $(gnome_data)/applications
+  desktop_DATA = monodevelop.desktop
+  pixmapdir = $(gnome_data)/pixmaps
+--- 298,304 ----
+  # (mkdir ../../build/bin/ hack)
+  SUBDIRS = Core build po Extras
+  bin_SCRIPTS = monodevelop
+! gnome_data = @prefix@/share
+  desktopdir = $(gnome_data)/applications
+  desktop_DATA = monodevelop.desktop
+  pixmapdir = $(gnome_data)/pixmaps
+***************
+*** 809,818 ****
+  all:
+  
+  install-data-hook:
+! 	$(UPDATE_MIME_DB) $(gnome_data)/mime
+  
+  uninstall-hook:
+! 	$(UPDATE_MIME_DB) $(gnome_data)/mime
+  
+  run: runmd
+  
+--- 809,818 ----
+  all:
+  
+  install-data-hook:
+! #	$(UPDATE_MIME_DB) $(gnome_data)/mime
+  
+  uninstall-hook:
+! #	$(UPDATE_MIME_DB) $(gnome_data)/mime
+  
+  run: runmd
+  
+Only in MonoDevelop: Makefile.in~

pkgs/applications/editors/monodoc/builder.sh

@@ -0,0 +1,21 @@
+. $stdenv/setup
+. $makeWrapper
+
+postInstall=postInstall
+postInstall() {
+    mv $out/bin $out/bin-orig
+    mkdir $out/bin
+
+    for i in $out/bin-orig/*; do
+        echo "wrapping $(basename $i)"
+        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
+        makeWrapper "$i" "$out/bin/$(basename $i)" \
+            --suffix PATH ':' "$(dirname $(type -p mono))" \
+            --suffix MONO_GAC_PREFIX ':' "$gtksharp" \
+            --suffix MONO_GAC_PREFIX ':' "$out"
+    done
+}
+
+genericBuild
+
+

pkgs/applications/editors/monodoc/default.nix

@@ -0,0 +1,17 @@
+{stdenv, fetchurl, mono, gtksharp, pkgconfig}:
+
+stdenv.mkDerivation {
+  name = "monodoc-1.0.6";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/monodoc-1.0.6.tar.gz;
+    md5 = "f2fc27e8e4717d90dc7efa2450625693";
+  };
+
+  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
+
+  buildInputs = [mono gtksharp pkgconfig];
+
+  inherit gtksharp;
+}

pkgs/applications/editors/nano/builder.sh

@@ -0,0 +1,4 @@
+. $stdenv/setup
+
+export CFLAGS="$CFLAGS -I$ncurses/include/ncurses"
+genericBuild

pkgs/applications/editors/nano/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, ncurses}:
+
+stdenv.mkDerivation {
+  name = "nano-1.2.4";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/nano-1.2.4.tar.gz;
+    md5 = "2c513310ec5e8b63abaecaf48670ac7a";
+  };
+
+  inherit ncurses;
+  buildInputs = [ncurses];
+}

pkgs/applications/editors/vim/builder.sh

@@ -0,0 +1,3 @@
+. $stdenv/setup
+
+genericBuild

pkgs/applications/editors/vim/default.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, ncurses}:
+ 
+stdenv.mkDerivation {
+  name = "vim-6.3";
+ 
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/vim-6.3.tar.bz2;
+    md5 = "821fda8f14d674346b87e3ef9cb96389";
+  };
+ 
+  inherit ncurses;
+  buildInputs = [ncurses];
+}

pkgs/applications/graphics/f-spot/builder.sh

@@ -0,0 +1,28 @@
+. $stdenv/setup
+. $makeWrapper
+
+postInstall=postInstall
+postInstall() {
+    mv $out/bin $out/bin-orig
+    mkdir $out/bin
+
+    for i in $out/bin-orig/*; do
+        echo "wrapping $(basename $i)"
+        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
+        makeWrapper "$i" "$out/bin/$(basename $i)" \
+            --prefix PATH ':' "$(dirname $(type -p mono))" \
+            --prefix LD_LIBRARY_PATH ':' "$sqlite/lib" \
+            --prefix LD_LIBRARY_PATH ':' "$libgnomeui/lib/libglade/2.0" \
+            --prefix MONO_GAC_PREFIX ':' "$gtksharp"
+    done
+    
+    # !!! hack
+    export ALL_INPUTS="$out $pkgs"
+
+    find $out -name "*.dll.config" -o -name "*.exe.config" | while read configFile; do
+        echo "modifying config file $configFile"
+        $monoDLLFixer "$configFile"
+    done
+}
+
+genericBuild

pkgs/applications/graphics/f-spot/default.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, mono, libexif
+, libgnome, libgnomeui, gtksharp, libjpeg, sqlite, lcms, libgphoto2
+, monoDLLFixer
+}:
+
+stdenv.mkDerivation {
+  name = "f-spot-0.0.10";
+
+  builder = ./builder.sh;
+  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
+  
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/f-spot-0.0.10.tar.bz2;
+    md5 = "19cc6e067ccc261b0502ff6189b79832";
+  };
+
+  patches = [./dllmap.patch];
+
+  buildInputs = [
+    perl perlXMLParser pkgconfig mono libexif
+    libgnome libgnomeui gtksharp libjpeg sqlite
+    lcms libgphoto2
+  ];
+
+  inherit monoDLLFixer gtksharp sqlite libgnomeui;
+}

pkgs/applications/graphics/f-spot/dllmap.patch

@@ -0,0 +1,28 @@
+diff -rc f-spot-0.0.10-orig/libgphoto2-sharp/libgphoto2-sharp.dll.config f-spot-0.0.10/libgphoto2-sharp/libgphoto2-sharp.dll.config
+*** f-spot-0.0.10-orig/libgphoto2-sharp/libgphoto2-sharp.dll.config	2005-02-27 19:25:09.000000000 +0100
+--- f-spot-0.0.10/libgphoto2-sharp/libgphoto2-sharp.dll.config	2005-03-11 12:13:12.000000000 +0100
+***************
+*** 1,3 ****
+  <configuration>
+!   <dllmap dll="libgphoto2.so" target="/usr/lib/libgphoto2.so.2"/>
+  </configuration>
+--- 1,3 ----
+  <configuration>
+!   <dllmap dll="libgphoto2.so" target="libgphoto2.so.2"/>
+  </configuration>
+diff -rc f-spot-0.0.10-orig/src/f-spot.exe.config.in f-spot-0.0.10/src/f-spot.exe.config.in
+*** f-spot-0.0.10-orig/src/f-spot.exe.config.in	2005-02-27 18:03:02.000000000 +0100
+--- f-spot-0.0.10/src/f-spot.exe.config.in	2005-03-11 12:48:03.000000000 +0100
+***************
+*** 9,13 ****
+    <dllmap dll="libfspoteog" target="@prefix@/lib/f-spot/libfspoteog.so.0"/>
+    <dllmap dll="libfspotjpeg" target="@prefix@/lib/f-spot/libfspotjpg.so.0"/>
+    <dllmap dll="liblcms-1.0.0.dll" target="liblcms.so.1"/>
+!   <dllmap dll="libexif.dll" target="libexif.so.@EXIF_SOVERSION@"/>
+  </configuration>
+--- 9,13 ----
+    <dllmap dll="libfspoteog" target="@prefix@/lib/f-spot/libfspoteog.so.0"/>
+    <dllmap dll="libfspotjpeg" target="@prefix@/lib/f-spot/libfspotjpg.so.0"/>
+    <dllmap dll="liblcms-1.0.0.dll" target="liblcms.so.1"/>
+!   <dllmap dll="libexif.dll" target="libexif.so"/>
+  </configuration>

pkgs/applications/graphics/gqview/default.nix

@@ -0,0 +1,17 @@
+{stdenv, fetchurl, pkgconfig, gtk, libpng}:
+
+assert pkgconfig != null && gtk != null && libpng != null;
+# Note that we cannot just copy gtk's png attribute, since gtk might
+# not be linked against png.
+# !!! assert libpng == gtk.libpng;
+
+stdenv.mkDerivation {
+  name = "gqview-1.4.5";
+
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gqview-1.4.5.tar.gz;
+    md5 = "b196935767c2d3dc61243d9ed0801c2e";
+  };
+
+  buildInputs = [pkgconfig gtk libpng];
+}

pkgs/applications/misc/acrobat-reader/builder.sh

@@ -0,0 +1,21 @@
+. $stdenv/setup
+
+echo "unpacking $src..."
+tar xvfz $src
+
+mkdir $out
+
+echo "unpacking reader..."
+tar xvf ./COMMON.TAR -C $out
+tar xvf ./LINUXRDR.TAR -C $out
+
+glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
+
+patchelf --interpreter $glibc/lib/ld-linux.so.* $out/Reader/intellinux/bin/acroread
+
+sed "s^REPLACE_ME^$out/Reader^" $out/bin/acroread.sh > $out/bin/acroread.sh.tmp
+echo "#! /bin/sh" > $out/bin/acroread.sh
+echo "LD_LIBRARY_PATH=$libXt/lib:$libXp/lib:$libXext/lib:$libX11/lib" >> $out/bin/acroread.sh
+cat $out/bin/acroread.sh.tmp >> $out/bin/acroread.sh
+chmod 755 $out/bin/acroread.sh
+mv $out/bin/acroread.sh $out/bin/acroread

pkgs/applications/misc/acrobat-reader/default.nix

@@ -0,0 +1,12 @@
+{stdenv, fetchurl, patchelf, libXt, libXp, libXext, libX11}:
+
+stdenv.mkDerivation {
+  name = "acrobat-reader-5.0.9";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/linux-509.tar.gz;
+    md5 = "53b7ca0fc83ab81214ba82050ce89c64";
+  };
+  buildInputs = [patchelf];
+  inherit libXt libXp libXext libX11;
+}

pkgs/applications/misc/hello/ex-1/builder.sh

@@ -0,0 +1,9 @@
+. $stdenv/setup
+
+PATH=$perl/bin:$PATH
+
+tar xvfz $src
+cd hello-*
+./configure --prefix=$out
+make
+make install

pkgs/applications/misc/hello/ex-1/default.nix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl, perl}:
+
+stdenv.mkDerivation {
+  name = "hello-2.1.1";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/hello-2.1.1.tar.gz;
+    md5 = "70c9ccf9fac07f762c24f2df2290784d";
+  };
+  inherit perl;
+}

pkgs/applications/misc/hello/ex-2/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl, perl}:
+
+stdenv.mkDerivation {
+  name = "hello-2.1.1";
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/hello-2.1.1.tar.gz;
+    md5 = "70c9ccf9fac07f762c24f2df2290784d";
+  };
+  buildInputs = [perl];
+}

pkgs/applications/misc/xchm/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl, wxGTK, chmlib}:
+
+stdenv.mkDerivation {
+  name = "xchm-0.9.1";
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xchm-0.9.1.tar.gz;
+    md5 = "5ba671e09e4c3ac46ffb5ce9d2c985eb";
+  };
+  buildInputs = [wxGTK chmlib];
+}

pkgs/applications/networking/browsers/firefox-wrapper/builder.sh

@@ -0,0 +1,7 @@
+. $stdenv/setup
+. $makeWrapper
+
+makeWrapper "$firefox/bin/firefox" "$out/bin/firefox" \
+    --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
+    --suffix-contents LD_LIBRARY_PATH ':' "$(filterExisting $(addSuffix /extra-library-path $plugins))" \
+    --suffix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))"

pkgs/applications/networking/browsers/firefox-wrapper/default.nix

@@ -0,0 +1,14 @@
+{stdenv, firefox, plugins}:
+
+stdenv.mkDerivation {
+  name = firefox.name;
+
+  builder = ./builder.sh;
+  makeWrapper = ../../../../build-support/make-wrapper/make-wrapper.sh;
+
+  inherit firefox;
+
+  # Let each plugin tell us (through its `mozillaPlugin') attribute
+  # where to find the plugin in its tree.
+  plugins = map (x: x ~ x.mozillaPlugin) plugins;
+}

pkgs/applications/networking/browsers/firefox/builder.sh

@@ -0,0 +1,53 @@
+. $stdenv/setup
+
+preConfigure=preConfigure
+preConfigure() {
+    cat > .mozconfig <<EOF
+. \$topsrcdir/browser/config/mozconfig
+ac_add_options --prefix=$out
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --enable-xft
+ac_add_options --disable-freetype2
+#ac_add_options --enable-swg
+ac_add_options --enable-strip
+ac_add_options --enable-default-toolkit=gtk2
+#ac_add_options --disable-shared
+#ac_add_options --enable-static
+#ac_add_options --with-system-jpeg
+#ac_add_options --with-system-png
+#ac_add_options --with-system-zlib
+EOF
+}
+
+postInstall=postInstall
+postInstall() {
+
+    # Strip some more stuff
+    strip -S $out/lib/*/* || true
+
+    # We don't need this (do we?)
+#    rm -rf $out/include
+
+    # This fixes starting Firefox when there already is a running
+    # instance.  The `firefox' wrapper script actually expects to be
+    # in the same directory as `run-mozilla.sh', apparently.
+    cd $out/bin
+    mv firefox ../lib/firefox-*/
+    ln -s ../lib/firefox-*/firefox .
+
+    # Register extension etc.
+    echo "running firefox -register..."
+    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./firefox-bin -register) || false
+
+    echo "running regxpcom..."
+    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regxpcom) || false
+    
+    echo "running regchrome..."
+    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regchrome) || false
+    
+}
+
+makeFlags="-f client.mk build"
+
+genericBuild

pkgs/applications/networking/browsers/firefox/default.nix

@@ -0,0 +1,17 @@
+{stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi}:
+
+# !!! assert libIDL.glib == gtk.glib;
+
+(stdenv.mkDerivation {
+  name = "firefox-1.0.1";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/firefox-1.0.1-source.tar.bz2;
+    md5 = "ebaea974fea9460ab7050fff76b41cb1";
+  };
+
+  buildInputs = [pkgconfig gtk perl zip libIDL libXi];
+
+  patches = [./writable-copies.patch];
+}) // {inherit gtk;}

pkgs/applications/networking/browsers/firefox/writable-copies.patch

@@ -0,0 +1,23 @@
+diff -rc mozilla-orig/xpcom/io/nsLocalFileUnix.cpp mozilla/xpcom/io/nsLocalFileUnix.cpp
+*** mozilla-orig/xpcom/io/nsLocalFileUnix.cpp	2004-04-03 01:48:18.000000000 +0200
+--- mozilla/xpcom/io/nsLocalFileUnix.cpp	2004-10-05 19:48:04.000000000 +0200
+***************
+*** 634,639 ****
+--- 634,640 ----
+          // get the dirs old permissions
+          if (NS_FAILED(rv = GetPermissions(&oldPerms)))
+              return rv;
++         oldPerms |= 0200;
+          if (NS_FAILED(rv = newParent->Create(DIRECTORY_TYPE, oldPerms)))
+              return rv;
+      } else {    // dir exists lets try to use leaf
+***************
+*** 758,763 ****
+--- 759,765 ----
+          // get the old permissions
+          PRUint32 myPerms;
+          GetPermissions(&myPerms);
++         myPerms |= 0200;
+  
+          // Create the new file with the old file's permissions, even if write
+          // permission is missing.  We can't create with write permission and

pkgs/applications/networking/browsers/lynx/builder.sh

@@ -0,0 +1,5 @@
+. $stdenv/setup
+
+export CFLAGS="-I$ncurses/include/ncurses"
+
+genericBuild

pkgs/applications/networking/browsers/lynx/default.nix

@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, ncurses
+, sslSupport ? true, openssl ? null
+}:
+
+assert sslSupport -> openssl != null;
+
+stdenv.mkDerivation {
+  name = "lynx-2.8.5";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/lynx2.8.5.tar.bz2;
+    md5 = "d1e5134e5d175f913c16cb6768bc30eb";
+  };
+  inherit ncurses;
+  configureFlags = (if sslSupport then "--with-ssl" else "");
+  buildInputs = [ncurses (if sslSupport then openssl else null)];
+}

pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh

@@ -0,0 +1,13 @@
+. $stdenv/setup
+
+dontBuild=1
+dontMakeInstall=1
+
+postInstall=postInstall
+postInstall() {
+    mkdir -p $out/lib/mozilla/plugins
+    cp -p flashplayer.xpt libflashplayer.so $out/lib/mozilla/plugins
+    echo "$zlib/lib:$libXmu/lib" > $out/lib/mozilla/plugins/extra-library-path
+}
+
+genericBuild

pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, zlib, libXmu}:
+
+(stdenv.mkDerivation {
+  name = "flashplayer-7.0r25";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/install_flash_player_7_linux.tar.gz;
+    md5 = "79c59a5ea29347e01c8e6575dd054cd1";
+  };
+
+  inherit zlib libXmu;
+}) // {mozillaPlugin = "/lib/mozilla/plugins";}

pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh

@@ -0,0 +1,24 @@
+. $stdenv/setup
+
+# The Firefox pkgconfig files are buggy; they are called firefox-*.pc,
+# but they refer to mozilla-*.pc.  Also, mplayerplug-in requires
+# mozilla-*.pc.
+mkdir pkgconfig
+for i in $firefox/lib/pkgconfig/*.pc; do
+    ln -s $i pkgconfig/$(echo $(basename $i) | sed s/firefox/mozilla/)
+done
+PKG_CONFIG_PATH=$NIX_BUILD_TOP/pkgconfig:$PKG_CONFIG_PATH
+
+firefoxIncl=$(echo $firefox/include/firefox-*)
+export NIX_CFLAGS_COMPILE="-I$firefoxIncl $NIX_CFLAGS_COMPILE"
+
+dontMakeInstall=1
+
+postInstall=postInstall
+postInstall() {
+    mkdir -p $out/lib/mozilla/plugins
+    cp -p mplayerplug-in.so mplayerplug-in.xpt $out/lib/mozilla/plugins
+}
+
+genericBuild
+

pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix

@@ -0,0 +1,19 @@
+{stdenv, fetchurl, pkgconfig, firefox, libXpm}:
+
+# Note: we shouldn't be dependent on Firefox.  The only thing we need
+# are the include files so that we can access the plugin API (I
+# think).
+
+(stdenv.mkDerivation {
+  name = "mplayerplug-in-2.80";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mplayerplug-in-2.80.tar.gz;
+    md5 = "ce3235ff7d46fae416cfb175193a5f25";
+  };
+
+  buildInputs = [pkgconfig firefox (firefox.gtk) libXpm];
+  
+  inherit firefox;
+}) // {mozillaPlugin = "/lib/mozilla/plugins";}

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

@@ -0,0 +1,14 @@
+buildInputs="$gtk $gdkpixbuf $openssl"
+. $stdenv/setup
+
+if test "$sslSupport" = 1; then
+    configureFlags="--enable-ssl $configureFlags"
+fi
+
+if test "$imageSupport" = 1; then
+    configureFlags="--enable-gdk-pixbuf $configureFlags"
+else
+    configureFlags="--disable-gdk-pixbuf --disable-imlibtest $configureFlags"
+fi
+
+genericBuild

pkgs/applications/networking/mailreaders/sylpheed/default.nix

@@ -0,0 +1,24 @@
+{ sslSupport ? true
+, imageSupport ? true
+, stdenv, fetchurl, gtk, openssl ? null, gdkpixbuf ? null
+}:
+
+assert gtk != null;
+assert sslSupport -> openssl != null;
+assert imageSupport -> gdkpixbuf != null;
+
+stdenv.mkDerivation {
+  name = "sylpheed-1.0.0";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/sylpheed-1.0.0.tar.bz2;
+    md5 = "864c4fc581a5ab1c7af5e06153c76769";
+  };
+
+  inherit sslSupport imageSupport;
+
+  inherit gtk;
+  openssl = if sslSupport then openssl else null;
+  gdkpixbuf = if imageSupport then gdkpixbuf else null;
+}

pkgs/applications/networking/mailreaders/thunderbird/builder.sh

@@ -0,0 +1,22 @@
+. $stdenv/setup
+
+preConfigure() {
+    cat mail/config/mozconfig > .mozconfig
+    cat >> .mozconfig <<EOF
+ac_add_options --disable-debug
+ac_add_options --enable-optimize=-O2
+ac_add_options --disable-ldap
+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 --enable-single-profile
+ac_add_options --prefix=$out
+EOF
+}
+
+preConfigure=preConfigure
+
+makeFlags="-f client.mk build"
+
+genericBuild

pkgs/applications/networking/mailreaders/thunderbird/default.nix

@@ -0,0 +1,18 @@
+{stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL}:
+
+assert pkgconfig != null && gtk != null && perl != null
+  && zip != null && libIDL != null;
+
+# !!! assert libIDL.glib == gtk.glib;
+
+stdenv.mkDerivation {
+  name = "thunderbird-0.8";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/thunderbird-source-0.8.tar.bz2;
+    md5 = "76de1827d66ac482cfc4dd32e7b1e257";
+  };
+
+  buildInputs = [pkgconfig gtk perl zip libIDL];
+}

pkgs/applications/networking/newsreaders/pan/default.nix

@@ -0,0 +1,25 @@
+{ spellChecking ? true
+, stdenv, fetchurl, pkgconfig, gtk, gtkspell ? null, gnet
+, libxml2, perl, pcre
+}:
+
+assert pkgconfig != null && gtk != null && gnet != null
+  && libxml2 != null && perl != null && pcre != null;
+assert spellChecking -> gtkspell != null /* !!! && gtk == gtkspell.gtk */;
+# !!! assert gtk.glib == gnet.glib;
+
+stdenv.mkDerivation {
+  name = "pan-0.14.2.91";
+
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pan-0.14.2.91.tar.bz2;
+    md5 = "4770d899a1c1ba968ce96bc5aeb07b62";
+  };
+
+  buildInputs = [
+    pkgconfig gtk gnet libxml2 perl pcre
+    (if spellChecking then gtkspell else null)
+  ];
+
+  inherit spellChecking stdenv;
+}

pkgs/applications/version-management/rcs/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "rcs-5.7";
+  # builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/rcs-5.7.tar;
+    md5 = "f7b3f106bf87ff6344df38490f6a02c5";
+  };
+}

pkgs/applications/version-management/subversion-1.1.x/builder.sh

@@ -0,0 +1,60 @@
+buildInputs="$openssl $zlib $db4 $httpd $swig $python $j2sdk $expat $patch"
+. $stdenv/setup
+
+configureFlags="--without-gdbm --disable-static"
+
+if test "$localServer"; then
+    configureFlags="--with-berkeley-db=$db4 $configureFlags"
+fi
+
+if test "$sslSupport"; then
+    configureFlags="--with-ssl --with-libs=$openssl $configureFlags"
+fi
+
+if test "$httpServer"; then
+    configureFlags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $configureFlags"
+    makeFlags="APACHE_LIBEXECDIR=$out/modules $makeFlags"
+fi
+
+if test -n "$pythonBindings" -o -n "$javaSwigBindings"; then
+    configureFlags="--with-swig=$swig $configureFlags"
+fi
+
+if test "$javahlBindings"; then
+    configureFlags="--enable-javahl --with-jdk=$j2sdk $configureFlags"
+fi
+
+installFlags="$makeFlags"
+
+
+postInstall() {
+    if test "$pythonBindings"; then
+        make swig-py
+        make install-swig-py
+    fi
+    if test "$javaSwigBindings"; then
+        # Hack to get Java-Swig bindings to build if Python is not in
+        # scope (this fails because Subversion's configure script does
+        # something silly like `SWIG_JAVA_COMPILE="$SWIG_PY_COMPILE"').
+        FL1='SWIG_JAVA_COMPILE=gcc'
+        FL2='SWIG_JAVA_LINK=gcc -L$(SWIG_BUILD_DIR)/.libs'
+        make swig-java "$FL1" "$FL2"
+        make swig-java-api "$FL1" "$FL2"
+        make swig-java-java "$FL1" "$FL2"
+        make install-swig-java "$FL1" "$FL2"
+    fi
+    if test "$javahlBindings"; then
+        mkdir -p subversion/bindings/java/javahl/classes # bug fix
+        make javahl
+        make install-javahl
+        mkdir -p $out/share/doc/$name
+        $j2sdk/bin/javadoc -d $out/share/doc/$name \
+            -windowtitle "JavaHL Subversion Bindings" \
+            -link http://java.sun.com/j2se/1.4.2/docs/api/ \
+            subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/*.java
+    fi
+}
+postInstall=postInstall
+
+
+genericBuild

pkgs/applications/version-management/subversion-1.1.x/default.nix

@@ -0,0 +1,46 @@
+{ localServer ? false
+, httpServer ? false
+, sslSupport ? false
+, compressionSupport ? false
+, pythonBindings ? false
+, javaSwigBindings ? false
+, javahlBindings ? false
+, stdenv, fetchurl
+, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, j2sdk ? null, zlib ? null
+}:
+
+assert expat != null;
+assert localServer -> db4 != null;
+assert httpServer -> httpd != null && httpd.expat == expat;
+assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl);
+assert pythonBindings -> swig != null && swig.pythonSupport;
+assert javaSwigBindings -> swig != null && swig.javaSupport;
+assert javahlBindings -> j2sdk != null;
+assert compressionSupport -> zlib != null;
+
+stdenv.mkDerivation {
+  name = "subversion-1.1.3";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/subversion-1.1.3.tar.bz2;
+    md5 = "a09c2b2fa1a09566c024547954a48478";
+  };
+
+  # This is a hopefully temporary fix for the problem that
+  # libsvnjavahl.so isn't linked against libstdc++, which causes
+  # loading the library into the JVM to fail.
+  patches = if javahlBindings then [./javahl.patch] else [];
+
+  openssl = if sslSupport then openssl else null;
+  zlib = if compressionSupport then zlib else null;
+  httpd = if httpServer then httpd else null;
+  db4 = if localServer then db4 else null;
+  swig = if pythonBindings || javaSwigBindings then swig else null;
+  python = if pythonBindings then swig.python else null;
+  j2sdk = if javaSwigBindings then swig.j2sdk else
+          if javahlBindings then j2sdk else null;
+
+  inherit expat localServer httpServer sslSupport
+          pythonBindings javaSwigBindings javahlBindings;
+}

pkgs/applications/version-management/subversion-1.1.x/javahl.patch

@@ -0,0 +1,20 @@
+diff -rc subversion-orig/build-outputs.mk subversion-1.1.0-rc2/build-outputs.mk
+*** subversion-orig/build-outputs.mk	2004-08-10 20:17:32.000000000 +0200
+--- subversion-1.1.0-rc2/build-outputs.mk	2004-08-23 21:04:35.000000000 +0200
+***************
+*** 200,206 ****
+  libsvnjavahl_DEPS =  subversion/bindings/java/javahl/native/BlameCallback.lo subversion/bindings/java/javahl/native/CommitMessage.lo subversion/bindings/java/javahl/native/Inputer.lo subversion/bindings/java/javahl/native/JNIByteArray.lo subversion/bindings/java/javahl/native/JNICriticalSection.lo subversion/bindings/java/javahl/native/JNIMutex.lo subversion/bindings/java/javahl/native/JNIStackElement.lo subversion/bindings/java/javahl/native/JNIStringHolder.lo subversion/bindings/java/javahl/native/JNIThreadData.lo subversion/bindings/java/javahl/native/JNIUtil.lo subversion/bindings/java/javahl/native/MessageReceiver.lo subversion/bindings/java/javahl/native/Notify.lo subversion/bindings/java/javahl/native/Outputer.lo subversion/bindings/java/javahl/native/Path.lo subversion/bindings/java/javahl/native/Pool.lo subversion/bindings/java/javahl/native/Prompter.lo subversion/bindings/java/javahl/native/Revision.lo subversion/bindings/java/javahl/native/SVNAdmin.lo subversion/bindings/java/javahl/native/SVNBase.lo subversion/bindings/java/javahl/native/SVNClient.lo subversion/bindings/java/javahl/native/Targets.lo subversion/bindings/java/javahl/native/libsvnjavahl.la.lo subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNAdmin.lo subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.lo subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
+  libsvnjavahl_OBJECTS = BlameCallback.lo CommitMessage.lo Inputer.lo JNIByteArray.lo JNICriticalSection.lo JNIMutex.lo JNIStackElement.lo JNIStringHolder.lo JNIThreadData.lo JNIUtil.lo MessageReceiver.lo Notify.lo Outputer.lo Path.lo Pool.lo Prompter.lo Revision.lo SVNAdmin.lo SVNBase.lo SVNClient.lo Targets.lo libsvnjavahl.la.lo org_tigris_subversion_javahl_SVNAdmin.lo org_tigris_subversion_javahl_SVNClient.lo
+  subversion/bindings/java/javahl/native/libsvnjavahl-1.la: $(libsvnjavahl_DEPS)
+! 	cd subversion/bindings/java/javahl/native && $(LINK_JAVAHL_CXX) -o libsvnjavahl-1.la $(LT_NO_UNDEFINED) $(libsvnjavahl_OBJECTS) ../../../../../subversion/libsvn_client/libsvn_client-1.la ../../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(NEON_LIBS) $(LIBS)
+  
+  locale_DEPS =  subversion/po/de.mo subversion/po/es.mo subversion/po/ja.mo subversion/po/nb.mo subversion/po/pl.mo subversion/po/sv.mo
+  locale: $(locale_DEPS)
+--- 200,206 ----
+  libsvnjavahl_DEPS =  subversion/bindings/java/javahl/native/BlameCallback.lo subversion/bindings/java/javahl/native/CommitMessage.lo subversion/bindings/java/javahl/native/Inputer.lo subversion/bindings/java/javahl/native/JNIByteArray.lo subversion/bindings/java/javahl/native/JNICriticalSection.lo subversion/bindings/java/javahl/native/JNIMutex.lo subversion/bindings/java/javahl/native/JNIStackElement.lo subversion/bindings/java/javahl/native/JNIStringHolder.lo subversion/bindings/java/javahl/native/JNIThreadData.lo subversion/bindings/java/javahl/native/JNIUtil.lo subversion/bindings/java/javahl/native/MessageReceiver.lo subversion/bindings/java/javahl/native/Notify.lo subversion/bindings/java/javahl/native/Outputer.lo subversion/bindings/java/javahl/native/Path.lo subversion/bindings/java/javahl/native/Pool.lo subversion/bindings/java/javahl/native/Prompter.lo subversion/bindings/java/javahl/native/Revision.lo subversion/bindings/java/javahl/native/SVNAdmin.lo subversion/bindings/java/javahl/native/SVNBase.lo subversion/bindings/java/javahl/native/SVNClient.lo subversion/bindings/java/javahl/native/Targets.lo subversion/bindings/java/javahl/native/libsvnjavahl.la.lo subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNAdmin.lo subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.lo subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
+  libsvnjavahl_OBJECTS = BlameCallback.lo CommitMessage.lo Inputer.lo JNIByteArray.lo JNICriticalSection.lo JNIMutex.lo JNIStackElement.lo JNIStringHolder.lo JNIThreadData.lo JNIUtil.lo MessageReceiver.lo Notify.lo Outputer.lo Path.lo Pool.lo Prompter.lo Revision.lo SVNAdmin.lo SVNBase.lo SVNClient.lo Targets.lo libsvnjavahl.la.lo org_tigris_subversion_javahl_SVNAdmin.lo org_tigris_subversion_javahl_SVNClient.lo
+  subversion/bindings/java/javahl/native/libsvnjavahl-1.la: $(libsvnjavahl_DEPS)
+! 	cd subversion/bindings/java/javahl/native && $(LINK_JAVAHL_CXX) -o libsvnjavahl-1.la $(LT_NO_UNDEFINED) $(libsvnjavahl_OBJECTS) ../../../../../subversion/libsvn_client/libsvn_client-1.la ../../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(NEON_LIBS) $(LIBS) -lstdc++
+  
+  locale_DEPS =  subversion/po/de.mo subversion/po/es.mo subversion/po/ja.mo subversion/po/nb.mo subversion/po/pl.mo subversion/po/sv.mo
+  locale: $(locale_DEPS)

pkgs/applications/video/MPlayer/builder.sh

@@ -0,0 +1,21 @@
+. $stdenv/setup
+
+# !!! Remove eventually.
+export _POSIX2_VERSION=199209
+
+postUnpack() {
+    unpackFile $fonts
+}
+postUnpack=postUnpack
+
+configureFlags="\
+ --with-win32libdir=$win32codecs \
+ --with-reallibdir=$win32codecs \
+ --enable-runtime-cpudetection"
+
+postInstall() {
+    cp -p ../font-arial-iso-8859-1/font-arial-18-iso-8859-1/* $out/share/mplayer/font
+}
+postInstall=postInstall
+
+genericBuild

pkgs/applications/video/MPlayer/default.nix

@@ -0,0 +1,32 @@
+{ alsaSupport ? false, xvSupport ? true, theoraSupport ? false
+, stdenv, fetchurl, x11, freetype, zlib
+, alsa ? null, libXv ? null, libtheora ? null}:
+
+assert alsaSupport -> alsa != null;
+assert xvSupport -> libXv != null;
+assert theoraSupport -> libtheora != null;
+
+stdenv.mkDerivation {
+  name = "MPlayer-1.0pre6";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/MPlayer-1.0pre6a.tar.bz2;
+    md5 = "a812d945b884c2e2fa7f90c57cd76bff";
+  };
+  fonts = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/font-arial-iso-8859-1.tar.bz2;
+    md5 = "1ecd31d17b51f16332b1fcc7da36b312";
+  };
+
+  win32codecs = (import ./win32codecs) {
+    inherit stdenv fetchurl;
+  };
+
+  buildInputs = [
+    x11 libXv freetype zlib
+    (if alsaSupport then alsa else null)
+    (if xvSupport then libXv else null)
+    (if theoraSupport then libtheora else null)
+  ];
+}

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

@@ -0,0 +1,11 @@
+. $stdenv/setup
+
+buildPhase=true
+
+installPhase() {
+    mkdir $out
+    cp -prv * $out
+}
+installPhase=installPhase
+
+genericBuild

pkgs/applications/video/MPlayer/win32codecs/default.nix

@@ -0,0 +1,8 @@
+{stdenv, fetchurl}: stdenv.mkDerivation {
+  name = "MPlayer-codecs-essential-20050115";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/essential-20050115.tar.bz2;
+    md5 = "b627e5710c6f2bf38fc2a6ef81c13be8";
+  };
+}

pkgs/applications/video/RealPlayer/builder.sh

@@ -0,0 +1,21 @@
+. $stdenv/setup
+. $makeWrapper
+
+ensureDir $out/real
+
+skip=143209
+
+(dd bs=1 count=$skip of=/dev/null && dd) < $src | (cd $out/real && tar xvfj -)
+
+rm -rf $out/real/Bin $out/real/postinst
+
+glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
+patchelf --interpreter $glibc/lib/ld-linux.so.* $out/real/realplay.bin
+
+ensureDir $out/bin
+makeWrapper "$out/real/realplay.bin" "$out/bin/realplay" \
+    --set HELIX_LIBS "$out/real" \
+    --suffix-each LD_LIBRARY_PATH ':' "$(addSuffix /lib $libPath)"
+
+echo "$libstdcpp5/lib" > $out/real/mozilla/extra-library-path
+echo "$out/bin" > $out/real/mozilla/extra-bin-path

pkgs/applications/video/RealPlayer/default.nix

@@ -0,0 +1,21 @@
+{stdenv, fetchurl, libstdcpp5, glib, pango, atk, gtk, libX11}:
+
+# Note that RealPlayer 10 need libstdc++.so.5, i.e., GCC 3.3, not 3.4.
+
+assert stdenv.system == "i686-linux";
+
+(stdenv.mkDerivation {
+  name = "RealPlayer-10.0.3.748-GOLD";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://software-dl.real.com/12ae5c4cc79d437fa106/unix/RealPlayer10GOLD.bin;
+    md5 = "70a88bcae0ab3e177e6fadecd6b8be24";
+  };
+
+  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
+
+  inherit libstdcpp5;
+  libPath = [libstdcpp5 glib pango atk gtk libX11];
+  
+}) // {mozillaPlugin = "/real/mozilla";}

pkgs/applications/video/mythtv/builder.sh

@@ -0,0 +1,20 @@
+. $stdenv/setup
+
+
+buildPhase=myBuilder
+myBuilder() {
+    qmake mythtv.pro || fail
+    make || fail
+}
+
+
+postInstall=postInstall
+postInstall() {
+    sqlDir="$out/share/mythtv/sql"
+    ensureDir $sqlDir
+    cp -p ./database/mc.sql $sqlDir/
+    cp -p ./setup/setup $out/bin/mythsetup
+}
+
+
+genericBuild

pkgs/applications/video/mythtv/default.nix

@@ -0,0 +1,18 @@
+{stdenv, fetchurl, which, qt3, x11, libXinerama, libXv, libXxf86vm, lame}:
+
+assert qt3.mysqlSupport;
+
+stdenv.mkDerivation {
+  name = "mythtv-0.17";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mythtv-0.17.tar.bz2;
+    md5 = "c996dc690d36e946396fc5cd4b715e3b";
+  };
+
+  patches = [./settings.patch];
+
+  buildInputs = [which qt3 x11 libXinerama libXv libXxf86vm lame];
+  inherit qt3;
+}

pkgs/applications/video/mythtv/settings.patch

@@ -0,0 +1,13 @@
+diff -rc mythtv-0.17-orig/settings.pro mythtv-0.17/settings.pro
+*** mythtv-0.17-orig/settings.pro	2005-02-11 05:02:39.000000000 +0100
+--- mythtv-0.17/settings.pro	2005-02-16 13:38:46.351279092 +0100
+***************
+*** 1,6 ****
+--- 1,7 ----
+  #CONFIG += debug
+  CONFIG += release
+  
++ PREFIX = $$(out)
+  isEmpty( PREFIX ) {
+      PREFIX = /usr/local
+  }

pkgs/applications/video/vlc/default.nix

@@ -0,0 +1,23 @@
+{ xvSupport ? true
+, stdenv, fetchurl, x11, libXv, wxGTK, libdvdcss, libdvdplay
+, mpeg2dec, a52dec, libmad, alsa}:
+
+assert libdvdplay.libdvdread.libdvdcss == libdvdcss;
+assert xvSupport -> libXv != null;
+
+stdenv.mkDerivation {
+  name = "vlc-0.7.2";
+
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/vlc-0.7.2.tar.gz;
+    md5 = "25dfcc804cb92f46c0b64ce1466515cc";
+  };
+
+  buildInputs = [
+    x11 wxGTK libdvdcss libdvdplay libdvdplay.libdvdread
+    mpeg2dec a52dec libmad alsa
+    (if xvSupport then libXv else null)
+  ];
+
+  configureFlags = "--disable-ffmpeg --enable-alsa";
+}

pkgs/applications/video/xine-ui/default.nix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl, x11, xineLib, libpng}:
+
+stdenv.mkDerivation {
+  name = "xine-ui-0.99.3";
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xine-ui-0.99.3.tar.gz;
+    md5 = "aa7805a93e511e3d67dc1bf09a71fcdd";
+  };
+  buildInputs = [x11 xineLib libpng];
+  configureFlags = "--without-readline";
+}

pkgs/applications/video/zapping/builder.sh

@@ -0,0 +1,9 @@
+. $stdenv/setup
+
+# !!! hack
+NIX_LDFLAGS="$NIX_LDFLAGS -rpath $libXext/lib"
+
+# !!! hack - `make install' tries to setuid to root
+installFlags="ZSFB_OWNER=`id -u` ZSFB_GROUP=`id -g`"
+
+genericBuild

pkgs/applications/video/zapping/default.nix

@@ -0,0 +1,42 @@
+{ teletextSupport ? true
+, jpegSupport ? true
+, pngSupport ? true
+, recordingSupport ? true
+# !!! libXext shouldn't be necessary (it's in x11); but the builder needs it.
+, stdenv, fetchurl, pkgconfig, perl, python, x11, libXv, libXmu, libXext, libgnomeui
+, libglade, scrollkeeper, esound, gettext, perlXMLParser
+, zvbi ? null, libjpeg ? null, libpng ? null, rte ? null }:
+
+assert pkgconfig != null && perl != null && python != null
+  && x11 != null && libXv != null && libXmu != null && libgnomeui != null && libglade != null
+  && scrollkeeper != null && esound != null && gettext != null
+  && perlXMLParser != null;
+
+assert teletextSupport -> zvbi != null && zvbi.pngSupport
+  /* !!! && pngSupport && zvbi.libpng == libpng */;
+
+assert jpegSupport -> libjpeg != null;
+assert pngSupport -> libpng != null;
+
+assert recordingSupport -> rte != null;
+
+stdenv.mkDerivation {
+  name = "zapping-0.7";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zapping-0.7.tar.bz2;
+    md5 = "dd7b3d920509709692c41c9c6c767746";
+  };
+
+  inherit teletextSupport jpegSupport pngSupport libXext;
+
+  buildInputs = [
+    pkgconfig perl perlXMLParser python x11 libXv libXmu libgnomeui
+    libglade scrollkeeper esound gettext
+    (if teletextSupport then zvbi else null)
+    (if jpegSupport then libjpeg else null)
+    (if pngSupport then libpng else null)
+    (if recordingSupport then rte else null)
+  ];
+}

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

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

pkgs/asfix-tools/asfix-tools.fix

@@ -1,19 +0,0 @@
-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,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/aterm/aterm.fix

@@ -1,12 +0,0 @@
-Package(
-  [ ("name", "aterm-2.0")
-  , ("build", Relative("aterm/aterm-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz")
-      , ("md5", "853474e4bcf4a85f7d38a0676b36bded")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)

pkgs/atk/atk-build.sh

@@ -1,13 +0,0 @@
-#! /bin/sh
-
-envpkgs=$glib
-. $stdenv/setup || exit 1
-export PATH=$pkgconfig/bin:$perl/bin:$PATH
-
-tar xvfj $src || exit 1
-cd atk-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-
-echo $envpkgs > $out/envpkgs || exit 1

pkgs/atk/atk.fix

@@ -1,16 +0,0 @@
-Package(
-  [ ("name", "atk-1.2.4")
-
-  , ("build", Relative("atk/atk-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.4.tar.bz2")
-      , ("md5", "2d6d50df31abe0e8892b5d3e7676a02d")
-      ]))
-
-  , ("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

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

pkgs/autoxt/autoxt.fix

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

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

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

@@ -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/baseenv/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/baseenv/setup.sh

@@ -1,40 +0,0 @@
-# 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"
-
-    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 -f $1/envpkgs; then
-        for i in $(cat $1/envpkgs); do
-            addtoenv $i
-        done
-    fi
-}
-
-oldenvpkgs=$envpkgs
-envpkgs=
-
-for i in $oldenvpkgs; do
-    addtoenv $i
-done
-
-# 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

@@ -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/bash/bash.fix

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

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

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

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

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

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

@@ -1,12 +0,0 @@
-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"))
-  ]
-)