* Grmbl.

svn path=/nixpkgs/trunk/; revision=4738

maintainers/docs/todo.txt

@@ -12,3 +12,5 @@
 * Add gettext to glib propagatedBuildInputs?  Glib's `gi18n.h' doesn't
   seem to like Glibc `libintl.h'; needs the gettext one instead.
   [Move from libbonoboui]
+
+* Fix the bzip2 build generically.

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

@@ -0,0 +1,24 @@
+source $stdenv/setup
+installFlags="PREFIX=$out"
+
+preBuild=preBuild
+preBuild() {
+    make -f Makefile-libbz2_so
+}
+
+preInstall=preInstall
+preInstall() {
+    ensureDir $out/lib
+    cp -p libbz2.so* $out/lib
+    ln -s libbz2.so.*.*.* $out/lib/libbz2.so
+}
+
+postInstall=postInstall
+postInstall() {
+    rm $out/bin/bunzip2 $out/bin/bzcat
+    ln -s bzip2 $out/bin/bunzip2
+    ln -s bzip2 $out/bin/bzcat
+}
+
+genericBuild
+

pkgs/tools/compression/bzip2/default.nix

@@ -2,7 +2,10 @@
 
 stdenv.mkDerivation {
   name = "bzip2-1.0.3";
-  builder = if stdenv.system == "powerpc-darwin" then ./builder-darwin.sh else ./builder.sh;
+  builder =
+    if stdenv.system == "powerpc-darwin" then ./builder-darwin.sh
+    if stdenv.system == "i686-freebsd" then ./builder-freebsd.sh
+    else ./builder.sh;
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/bzip2-1.0.3.tar.gz;
     md5 = "8a716bebecb6e647d2e8a29ea5d8447f";