Author: rob Date: 2010-07-06 08:18:14 +0000 (Tue, 06 Jul 2010) New Revision: 22486
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22486&view=rev Modified: nixpkgs/trunk/pkgs/applications/networking/browsers/chromium/default.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix Log: new version of chrome with new deps Changes: Modified: nixpkgs/trunk/pkgs/applications/networking/browsers/chromium/default.nix =================================================================== --- nixpkgs/trunk/pkgs/applications/networking/browsers/chromium/default.nix 2010-07-06 07:27:55 UTC (rev 22485) +++ nixpkgs/trunk/pkgs/applications/networking/browsers/chromium/default.nix 2010-07-06 08:18:14 UTC (rev 22486) @@ -27,23 +27,25 @@ , dbus , dbus_glib , patchelf +, cups +, libgcrypt }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ; stdenv.mkDerivation rec { name = "chrome-${version}"; - version = "47504"; + version = "51653"; src = if stdenv.system == "x86_64-linux" then fetchurl { 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 fetchurl { url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip";; - sha256 = "1g9m2d5x415gybjd6kvnhbj2sbfcaszv3dzvdwncsrcviic6w634"; + sha256 = "1kdhwkl7xxssmkrkkgrdwrwvbah97va7rxbwrfhlcnjgw60ppf9v"; } else null; @@ -53,7 +55,7 @@ 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 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 = '' ensureDir $out/bin Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-07-06 07:27:55 UTC (rev 22485) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-07-06 08:18:14 UTC (rev 22486) @@ -7471,7 +7471,7 @@ }; 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 (gtkLibs) gtk glib pango atk; inherit (gnome) GConf; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
