mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Code Issues Wiki Activity

* added patchelf pre-release 0.6 until it gets stable

Browse source 
* updated chrome to latest version


svn path=/nixpkgs/trunk/; revision=21836
This commit is contained in:
Rob Vermaas 2010-05-18 12:36:23 +00:00
parent 0563e08996
commit a07cdd3b23
3 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -24,23 +24,26 @@
, libjpeg , libjpeg
, bzip2 , bzip2
, libpng , libpng
, dbus
, dbus_glib
, patchelf
}: }:
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 = "35449"; version = "47504";
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 = "0fdm1hs67vcr68r290ami3zlyypcvd88rm059622qyadqz49yvcj"; sha256 = "06cwfr02acv9b0sbc14irqx099p4mgyjl9w58g1vja6r7jbb234c";
} }
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 = "1indm0s87yz9zsg4archsywvp4yd0ff83azkjbwszj0snggk16pg"; sha256 = "1g9m2d5x415gybjd6kvnhbj2sbfcaszv3dzvdwncsrcviic6w634";
} }
else null; else null;
@ -50,7 +53,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] ; [ 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] ;
installPhase = '' installPhase = ''
ensureDir $out/bin ensureDir $out/bin
@ -59,8 +62,8 @@ stdenv.mkDerivation rec {
cp -R * $out/chrome cp -R * $out/chrome
ln -s $out/chrome/chrome $out/bin/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 --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/libsmime3.so $out/lib/libsmime3.so.1d
ln -s ${nss}/lib/libnssutil3.so $out/lib/libnssutil3.so.1d ln -s ${nss}/lib/libnssutil3.so $out/lib/libnssutil3.so.1d

16
pkgs/development/tools/misc/patchelf/0.6.nix Normal file
View file

@ -0,0 +1,16 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "patchelf-0.6pre20950";
src = fetchurl {
url = "http://hydra.nixos.org/build/379622/download/3/patchelf-0.6pre20950.tar.gz";
sha256 = "d308c26f304e5102846a747296f9b89a8237fa8cc3685316901db1f72e66f43c";
};
meta = {
homepage = http://nixos.org/patchelf.html;
license = "GPL";
description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
};
}

7
pkgs/top-level/all-packages.nix
View file

@ -3292,6 +3292,10 @@ let
inherit fetchurl stdenv; inherit fetchurl stdenv;
}); });
patchelf06 = import ../development/tools/misc/patchelf/0.6.nix {
inherit fetchurl stdenv;
};
pmccabe = import ../development/tools/misc/pmccabe { pmccabe = import ../development/tools/misc/pmccabe {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
@ -7257,10 +7261,11 @@ 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; inherit stdenv fetchurl ffmpeg cairo nspr nss fontconfig freetype alsaLib makeWrapper unzip expat zlib bzip2 libpng dbus dbus_glib;
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;
patchelf = patchelf06;
libjpeg = libjpeg62; libjpeg = libjpeg62;
}; };