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

new version of chrome with new deps

Browse Source 
svn path=/nixpkgs/trunk/; revision=22486
This commit is contained in:
Rob Vermaas 2010-07-06 08:18:14 +00:00
parent b1eb6c96a8
commit ac26c3bee1
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,23 +27,25 @@
, dbus , dbus
, dbus_glib , dbus_glib
, patchelf , patchelf
, cups
, libgcrypt
}: }:
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-${version}"; name = "chrome-${version}";
version = "47504"; version = "51653";
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/${version}/chrome-linux.zip"; url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip";
sha256 = "06cwfr02acv9b0sbc14irqx099p4mgyjl9w58g1vja6r7jbb234c"; sha256 = "1d8q4ac8s3b1bncli537phzxshfr50j69y49409g5p64v7iya9kw";
} }
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/${version}/chrome-linux.zip"; url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip";
sha256 = "1g9m2d5x415gybjd6kvnhbj2sbfcaszv3dzvdwncsrcviic6w634"; sha256 = "1kdhwkl7xxssmkrkkgrdwrwvbah97va7rxbwrfhlcnjgw60ppf9v";
} }
else null; else null;
@ -53,7 +55,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 expat zlib libjpeg bzip2 libpng libXScrnSaver dbus dbus_glib] ; [ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt expat zlib libjpeg bzip2 libpng libXScrnSaver dbus dbus_glib cups libgcrypt] ;
installPhase = '' installPhase = ''
ensureDir $out/bin ensureDir $out/bin

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

@ -7471,7 +7471,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 expat zlib bzip2 libpng dbus dbus_glib; inherit stdenv fetchurl ffmpeg cairo nspr nss fontconfig freetype alsaLib makeWrapper unzip expat zlib bzip2 libpng dbus dbus_glib cups libgcrypt;
inherit (xlibs) libX11 libXext libXrender libXt libXScrnSaver; inherit (xlibs) libX11 libXext libXrender libXt libXScrnSaver;
inherit (gtkLibs) gtk glib pango atk; inherit (gtkLibs) gtk glib pango atk;
inherit (gnome) GConf; inherit (gnome) GConf;