diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-11 12:47:00 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-11 12:47:00 +0000 |
commit | ee04ffcb550809f7d97d709ff4ec709a21b30ab9 (patch) | |
tree | 470bdb3f97b0ab18d3abeec3e1f59db7a4af34ed /pkgs/applications/networking/browsers/chromium/default.nix | |
parent | 3f1a32c266f792290cb08c45ab40f22a43cb13cb (diff) | |
parent | 97d4a54698a4dea4b57ec4124591d75a740ee44e (diff) | |
download | nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.gz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.bz2 nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.lz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.xz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.zst nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.zip |
Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/default.nix')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 57 |
1 files changed, 16 insertions, 41 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index caa8430f0cd2..db8adeeb45fc 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,61 +1,37 @@ -{ stdenv -, fetchurl -, ffmpeg -, cairo -, pango -, glib -, libXrender -, libXScrnSaver -, gtk -, nspr -, nss -, fontconfig -, freetype -, alsaLib -, libX11 -, GConf -, libXext -, libXt -, atk -, makeWrapper -, unzip -, expat -, zlib -, libjpeg -, bzip2 -, libpng -, dbus -, dbus_glib -, patchelf -, cups -, libgcrypt -}: +{ GConf, alsaLib, atk, bzip2, cairo, cups, dbus, dbus_glib, + expat, fetchurl, ffmpeg, fontconfig, freetype, glib, gtk, + libX11, libXScrnSaver, libXdamage, libXext, libXrender, libXt, + libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, pango, + patchelf, stdenv, unzip, zlib }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ; stdenv.mkDerivation rec { name = "chrome-${version}"; version = "65039"; - src = - if stdenv.system == "x86_64-linux" then + 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 = "1ad7kwd1w1958mb3pwzhshawrf2nlxdsf0gy7d2q4qnx5d809vws"; - } - else if stdenv.system == "i686-linux" then + } + else if stdenv.system == "i686-linux" then fetchurl { url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip"; sha256 = "06hz3gvv3623ldrj141w3mnzw049yylvv9b9q5r6my8icm722phf"; - } + } else throw "Chromium is not supported on this platform."; phases = "unpackPhase installPhase"; buildInputs = [makeWrapper unzip]; - libPath = + libPath = stdenv.lib.makeLibraryPath - [ stdenv.gcc.libc 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] ; + [ GConf alsaLib atk bzip2 cairo cups dbus dbus_glib expat + ffmpeg fontconfig freetype glib gtk libX11 libXScrnSaver + libXdamage libXext libXrender libXt libgcrypt libjpeg libpng + nspr nss pango stdenv.gcc.gcc zlib stdenv.gcc.libc ]; installPhase = '' ensureDir $out/bin @@ -64,8 +40,7 @@ stdenv.mkDerivation rec { cp -R * $out/chrome ln -s $out/chrome/chrome $out/bin/chrome - ${patchelf}/bin/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 - + ${patchelf}/bin/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 |