* Sync with the trunk. backups/xorg-7.5@18179

svn path=/nixpkgs/branches/xorg-7.5/; revision=18122

5 files changed, 118 insertions, 11 deletions

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
new file mode 100644
index 0000000000000..b72e70227607c
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -0,0 +1,72 @@
+{ stdenv
+, fetchurl
+, ffmpeg
+, cairo
+, pango
+, glib
+, libXrender
+, gtk
+, nspr
+, nss
+, fontconfig
+, freetype
+, alsaLib
+, libX11
+, GConf
+, libXext
+, libXt
+, atk
+, makeWrapper
+, unzip
+, patchelf05
+}:
+
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
+
+stdenv.mkDerivation rec {
+  name = "chrome-20565";
+
+  src = 
+    if stdenv.system == "x86_64-linux" then 
+      fetchurl {
+        url = http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/30565/chrome-linux.zip;
+        sha256 = "0ngxbb27g6yqwllkbwyb41vldz00nr5r0rfb3b0arznql2dkynhy";
+      } 
+    else if stdenv.system == "i686-linux" then 
+      fetchurl {
+        url = http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/30565/chrome-linux.zip;
+        sha256 = "0q5432zn9jhy54s0w0xgdc2y0h7a51b8acc782s7j179hcgfa30a";
+      } 
+    else null;
+
+  phases="unpackPhase installPhase";
+
+  buildInputs = [makeWrapper unzip];
+
+  libPath = 
+    stdenv.lib.makeLibraryPath
+       [ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt] ;
+
+  installPhase = ''
+    ensureDir $out/bin
+    ensureDir $out/chrome
+    ensureDir $out/lib
+
+    cp -R * $out/chrome
+    ln -s $out/chrome/chrome $out/bin/chrome
+  
+    patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib $out/chrome/chrome 
+
+    ln -s ${nss}/lib/libsmime3.so $out/lib/libsmime3.so.1d
+    ln -s ${nss}/lib/libnssutil3.so $out/lib/libnssutil3.so.1d
+    ln -s ${nss}/lib/libssl3.so $out/lib/libssl3.so.1d
+    ln -s ${nss}/lib/libnss3.so $out/lib/libnss3.so.1d
+    ln -s ${nspr}/lib/libnspr4.so $out/lib/libnspr4.so.0d
+    ln -s ${nspr}/lib/libplds4.so $out/lib/libplds4.so.0d
+    ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so.0d
+  '';
+
+  meta = {
+    description = "";
+  };
+}
diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix
index 4e6743c0286b4..038531419b139 100644
--- a/pkgs/applications/networking/browsers/icecat-3/default.nix
+++ b/pkgs/applications/networking/browsers/icecat-3/default.nix
@@ -4,13 +4,13 @@
 , freetype, fontconfig
 , application ? "browser" }:
 
-let version = "3.5.3"; in
+let version = "3.5.4"; in
 stdenv.mkDerivation {
   name = "icecat-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.bz2";
-    sha256 = "0cjf75crk4g84swya57ixm7152v774hsxif3xrws4yz9dasqlz5j";
+    sha256 = "0j506l2qg30xg11zlfk8b2jwrp8bghc286j21gx0ws2qy6snagnr";
   };
 
   buildInputs = [
@@ -47,8 +47,8 @@ stdenv.mkDerivation {
     export dontPatchELF=1;
 
     # Strip some more stuff
-    strip -S $out/lib/*/* || true
-    
+    strip -S "$out/lib/"*"/"* || true
+
     # This fixes starting IceCat when there already is a running
     # instance.  The `icecat' wrapper script actually expects to be
     # in the same directory as `run-mozilla.sh', apparently.
@@ -81,7 +81,7 @@ stdenv.mkDerivation {
     # Put the GNU IceCat icon in the right place.
     ensureDir $out/lib/$libDir/chrome/icons/default
     ln -s ../../../icons/default.xpm  $out/lib/$libDir/chrome/icons/default/
-  ''; # */
+  '';
 
   meta = {
     description = "GNU IceCat, a free web browser based on Mozilla Firefox";
@@ -109,5 +109,3 @@ stdenv.mkDerivation {
     isFirefox3Like = true;
   };
 }
-
-
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
index 7b0ad7522258e..a345cf44cc597 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
@@ -1,4 +1,22 @@
-{stdenv, fetchurl, zlib, alsaLib, curl}:
+{ stdenv
+, fetchurl
+, zlib
+, alsaLib
+, curl
+, nss
+, nspr
+, fontconfig
+, freetype
+, expat
+, libX11
+, libXext
+, libXrender
+, libXt
+, gtk 
+, glib
+, pango
+, atk
+}:
 
 stdenv.mkDerivation {
   name = "flashplayer-10.0.32.18";
@@ -23,7 +41,7 @@ stdenv.mkDerivation {
     mozillaPlugin = "/lib/mozilla/plugins";
   };
 
-  rpath = "${zlib}/lib:${alsaLib}/lib:${curl}/lib";
+  rpath = stdenv.lib.makeLibraryPath [zlib alsaLib curl nss nspr fontconfig freetype expat libX11 libXext libXrender libXt gtk glib pango atk] ;
 
   meta = {
     description = "Adobe Flash Player browser plugin";
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh
index b58b289da7e7e..8a0cc3c94fee3 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh
@@ -6,7 +6,7 @@ dontPatchELF=1
 installPhase() {
     ensureDir $out/lib/mozilla/plugins
     cp -p libflashplayer.so $out/lib/mozilla/plugins
-    patchelf --set-rpath "$zlib/lib:$alsaLib/lib" $out/lib/mozilla/plugins/libflashplayer.so
+    patchelf --set-rpath $rpath $out/lib/mozilla/plugins/libflashplayer.so
 }
 
 genericBuild
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix
index f039d86e4e5c6..899d9fb48d2d9 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix
@@ -1,4 +1,21 @@
-{stdenv, fetchurl, zlib, alsaLib}:
+{ stdenv
+, fetchurl
+, zlib
+, alsaLib
+, nss
+, nspr
+, fontconfig
+, freetype
+, expat
+, libX11
+, libXext
+, libXrender
+, libXt
+, gtk
+, glib
+, pango
+, atk
+}:
 
 assert stdenv.system == "i686-linux";
 
@@ -17,6 +34,8 @@ stdenv.mkDerivation {
     mozillaPlugin = "/lib/mozilla/plugins";
   };
 
+  rpath = stdenv.lib.makeLibraryPath [zlib alsaLib nss nspr fontconfig freetype expat libX11 libXext libXrender libXt gtk glib pango atk] ;
+
   meta = {
     description = "Adobe Flash Player browser plugin";
     homepage = http://www.adobe.com/products/flashplayer/;