public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated version of chrome 

svn path=/nixpkgs/trunk/; revision=18131
This commit is contained in:
Rob Vermaas 2009-11-05 10:50:57 +00:00
parent d9f65496d4
commit 724d21e3b0
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -18,24 +18,25 @@
, atk , atk
, makeWrapper , makeWrapper
, unzip , unzip
, patchelf05 , expat
, zlib
}: }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ; assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "chrome-20565"; name = "chrome-${version}";
version = "31080";
src = src =
if stdenv.system == "x86_64-linux" then if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/30565/chrome-linux.zip; url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip";
sha256 = "0ngxbb27g6yqwllkbwyb41vldz00nr5r0rfb3b0arznql2dkynhy"; sha256 = "1km6mrhzgdlhy7pl60g8wh8hlxp0ymv6rqpp3aqd94mqj9g5asm9";
} }
else if stdenv.system == "i686-linux" then else if stdenv.system == "i686-linux" then
fetchurl { fetchurl {
url = http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/30565/chrome-linux.zip; url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip";
sha256 = "0q5432zn9jhy54s0w0xgdc2y0h7a51b8acc782s7j179hcgfa30a"; sha256 = "12awdamkkcb8kq2z7kila00yhn9msihq7b6970k9hghbwq95hjrk";
} }
else null; else null;
@ -45,7 +46,7 @@ stdenv.mkDerivation rec {
libPath = libPath =
stdenv.lib.makeLibraryPath stdenv.lib.makeLibraryPath
[ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt] ; [ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt expat zlib] ;
installPhase = '' installPhase = ''
ensureDir $out/bin ensureDir $out/bin

2
pkgs/top-level/all-packages.nix
View File

@ -6380,7 +6380,7 @@ let
}; };
chrome = import ../applications/networking/browsers/chromium { chrome = import ../applications/networking/browsers/chromium {
inherit stdenv fetchurl ffmpeg cairo nspr nss fontconfig freetype alsaLib makeWrapper unzip patchelf05; inherit stdenv fetchurl ffmpeg cairo nspr nss fontconfig freetype alsaLib makeWrapper unzip expat zlib;
inherit (xlibs) libX11 libXext libXrender libXt ; inherit (xlibs) libX11 libXext libXrender libXt ;
inherit (gtkLibs) gtk glib pango atk; inherit (gtkLibs) gtk glib pango atk;
inherit (gnome) GConf; inherit (gnome) GConf;