diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2010-01-04 07:47:32 +0000 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2010-01-04 07:47:32 +0000 |
| commit | c5157f7d9d537a9eff6fc587ab352966abf7294c (patch) | |
| tree | fdfa0d8ff7005136db36b25255919788de3c3328 /pkgs/top-level | |
| parent | c62430f6a6a9097546739fc8791f20797680d2af (diff) | |
| download | nixlib-c5157f7d9d537a9eff6fc587ab352966abf7294c.tar nixlib-c5157f7d9d537a9eff6fc587ab352966abf7294c.tar.gz nixlib-c5157f7d9d537a9eff6fc587ab352966abf7294c.tar.bz2 nixlib-c5157f7d9d537a9eff6fc587ab352966abf7294c.tar.lz nixlib-c5157f7d9d537a9eff6fc587ab352966abf7294c.tar.xz nixlib-c5157f7d9d537a9eff6fc587ab352966abf7294c.tar.zst nixlib-c5157f7d9d537a9eff6fc587ab352966abf7294c.zip | |
re-added libjpeg62 for chrome, updated chrome
svn path=/nixpkgs/trunk/; revision=19199
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57348193e91a..be0c666f2d89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3944,6 +3944,11 @@ let libtool = libtool_1_5; }; + libjpeg62 = makeOverridable (import ../development/libraries/libjpeg/62.nix) { + inherit fetchurl stdenv; + libtool = libtool_1_5; + }; + libjpegStatic = lowPrio (appendToName "static" (libjpeg.override { static = true; })); @@ -6340,10 +6345,11 @@ let }; chrome = import ../applications/networking/browsers/chromium { - inherit stdenv fetchurl ffmpeg cairo nspr nss fontconfig freetype alsaLib makeWrapper unzip expat zlib; + inherit stdenv fetchurl ffmpeg cairo nspr nss fontconfig freetype alsaLib makeWrapper unzip expat zlib bzip2 libpng; inherit (xlibs) libX11 libXext libXrender libXt ; inherit (gtkLibs) gtk glib pango atk; inherit (gnome) GConf; + libjpeg = libjpeg62; }; chromeWrapper = wrapFirefox chrome "chrome" ""; |