Added Firefox-3b2 (still no idea why it crashes, though), fixed updated FUSE, made relfs_grant add user if none exists

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

pkgs/applications/networking/browsers/firefox3b1/3b2.nix

@@ -0,0 +1,57 @@
+args: with args;
+
+stdenv.mkDerivation {
+  name = "firefox-3b2";
+
+  src = 
+	fetchurl {
+		url = ftp://ftp.mozilla.org/pub/firefox/releases/3.0b2/source/firefox-3.0b2-source.tar.bz2;
+		sha256 = "0mszad8j35wvzi67dp3j9sznqkgb9b3in22c5790g9b9pv6xk8jp";
+	};
+
+  buildInputs = [
+    pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo
+    python curl coreutils dbus dbus_glib pango freetype fontconfig 
+    libX11 libXrender libXft libXt
+  ];
+
+  configureFlags = [
+    "--enable-application=browser"
+    "--enable-optimize"
+    "--disable-debug"
+    "--enable-xft"
+    "--disable-freetype2"
+    "--enable-svg"
+    "--enable-canvas"
+    "--enable-strip"
+    "--enable-default-toolkit=cairo-gtk2"
+    "--with-system-jpeg"
+    "--with-system-zlib"
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+*     "--enable-system-cairo"
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+  ]
+;
+
+  postInstall = "
+    export dontPatchELF=1;
+    sed -e 's@moz_libdir=.*@&\\nexport PATH=\$PATH:${coreutils}/bin@' -i \$out/bin/firefox 
+    sed -e 's@`/bin/pwd@`${coreutils}/bin/pwd@' -i \$out/bin/firefox 
+    sed -e 's@`/bin/ls@`${coreutils}/bin/ls@' -i \$out/bin/firefox 
+
+    strip -S \$out/lib/*/* || true
+
+    libDir=\$(cd \$out/lib && ls -d firefox-[0-9]*)
+    test -n \"\$libDir\"
+
+    echo \"running firefox -register...\"
+    (cd \$out/lib/\$libDir && LD_LIBRARY_PATH=. ./firefox-bin -register) || false
+  ";
+
+  meta = {
+    description = "Mozilla Firefox - the browser, reloaded";
+  };
+
+  passthru = {inherit gtk;};
+}
+

pkgs/data/fonts/fontWrap/default.nix

@@ -0,0 +1,27 @@
+args : with args;
+	with builderDefs {
+		src =""; /* put a fetchurl here */
+		buildInputs = [mkfontdir mkfontscale];
+		configureFlags = [];
+	} null; /* null is a terminator for sumArgs */
+let
+	doInstall = FullDepEntry ("
+		ensureDir \$out/share/fonts/
+		cd \$out/share/fonts
+		for i in ${toString paths}; do
+			find \$i -type f -exec ln -s '{}' . ';' ;
+		done
+		mkfontdir 
+		mkfontscale
+	") [minInit addInputs defEnsureDir] ;
+in
+stdenv.mkDerivation rec {
+	name = "wrapped-font-dir";
+	builder = writeScript (name + "-builder")
+		(textClosure [ doInstall doForceShare doPropagate]);
+	meta = {
+		description = "
+		Just a wrapper to create fots.dir and fonts.scale .
+";
+	};
+}

pkgs/os-specific/linux/fuse/builder.sh

@@ -13,4 +13,6 @@ export UDEV_RULES_PATH=$out/etc/udev/rules.d
 # $PATH.
 export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/no-such-path\""
 
+export preBuild="sed -e 's@/bin/@$utillinux/bin/@g' -i lib/mount_util.c";
+
 genericBuild

pkgs/os-specific/linux/fuse/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+args: with args;
 
 stdenv.mkDerivation {
   name = "fuse-2.7.2";
@@ -7,7 +7,10 @@ stdenv.mkDerivation {
     url = mirror://sourceforge/fuse/fuse-2.7.2.tar.gz;
     sha256 = "1zxssdiirf19mihbnxpy0kiix35d4256b9lani7qwqi7m940jfgv";
   };
-  configureFlags = [ "--disable-kernel-module" ];
+  configureFlags = [ "--disable-kernel-module"];
+  buildInputs = [ utillinux ];
+  
+  inherit utillinux;
 
   meta = {
     homepage = http://fuse.sourceforge.net/;

pkgs/tools/misc/relfs/cvs.2007.12.01.nix

@@ -22,7 +22,9 @@ let build = FullDepEntry ("
 	sed -e '/install:/a\\\tmkdir -p '\$out'/share' -i Makefile
 	make
 	mkdir -p \$out/bin
-	echo 'dropdb relfs_\$1 ; 
+	echo '
+		createuser -A -D \$1
+		dropdb relfs_\$1 ; 
 		rm -rf /tmp/relfs-\$1-tmp;  
 		mkdir /tmp/relfs-\$1-tmp;  
 		USER=\$1 relfs -f -s /tmp/relfs-raskin-tmp  & 

pkgs/top-level/all-packages.nix

@@ -3027,7 +3027,7 @@ rec {
    };
 
    fuse = import ../os-specific/linux/fuse {
-     inherit fetchurl stdenv;
+     inherit fetchurl stdenv utillinux;
    };
 
    genext2fs = import ../os-specific/linux/genext2fs {
@@ -3581,6 +3581,10 @@ xorg_sys_opengl = import ../os-specific/linux/opengl/xorg-sys {
 
 ### DATA
 
+wrapFonts = paths : ((import ../data/fonts/fontWrap) {
+  inherit fetchurl stdenv builderDefs paths;
+  inherit (xorg) mkfontdir mkfontscale;
+});
 
 bakoma_ttf = import ../data/fonts/bakoma-ttf {
   inherit fetchurl stdenv;
@@ -3960,6 +3964,15 @@ firefox3b1 = lowPrio (import ../applications/networking/browsers/firefox3b1 {
 #enableOfficialBranding = true;
     });
 
+firefox3b2 = lowPrio (import ../applications/networking/browsers/firefox3b1/3b2.nix {
+    inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
+    python curl coreutils dbus dbus_glib freetype fontconfig;
+    inherit (gtkLibs) gtk pango;
+    inherit (gnome) libIDL;
+    inherit (xlibs) libXi libX11 libXrender libXft libXt;
+#enableOfficialBranding = true;
+    });
+
 firefox3b1Bin = lowPrio (import ../applications/networking/browsers/firefox3b1/binary.nix {
     inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
     python curl coreutils freetype fontconfig;