From c5157f7d9d537a9eff6fc587ab352966abf7294c Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 4 Jan 2010 07:47:32 +0000 Subject: [PATCH] re-added libjpeg62 for chrome, updated chrome svn path=/nixpkgs/trunk/; revision=19199 --- .../networking/browsers/chromium/default.nix | 11 ++++--- pkgs/development/libraries/libjpeg/62.nix | 29 +++++++++++++++++++ pkgs/development/libraries/libjpeg/builder.sh | 25 ++++++++++++++++ pkgs/top-level/all-packages.nix | 8 ++++- 4 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/libjpeg/62.nix create mode 100755 pkgs/development/libraries/libjpeg/builder.sh diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 9a57b8869ac..acdd07399b3 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -20,23 +20,26 @@ , unzip , expat , zlib +, libjpeg +, bzip2 +, libpng }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ; stdenv.mkDerivation rec { name = "chrome-${version}"; - version = "32599"; + version = "35449"; 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 = "1wz24hrnnjggsjxsaa4spqg73p1f7bv4a8l2ys3kbkdp709fl6v8"; + sha256 = "0fdm1hs67vcr68r290ami3zlyypcvd88rm059622qyadqz49yvcj"; } else if stdenv.system == "i686-linux" then fetchurl { url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip"; - sha256 = "16w6d7kp34jr1c4ym6y2h6llkq3d65rybj5hs46w1b8qri60q6aa"; + sha256 = "1indm0s87yz9zsg4archsywvp4yd0ff83azkjbwszj0snggk16pg"; } else null; @@ -46,7 +49,7 @@ stdenv.mkDerivation rec { 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] ; + [ 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] ; installPhase = '' ensureDir $out/bin diff --git a/pkgs/development/libraries/libjpeg/62.nix b/pkgs/development/libraries/libjpeg/62.nix new file mode 100644 index 00000000000..fb92fe995b6 --- /dev/null +++ b/pkgs/development/libraries/libjpeg/62.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, libtool, static ? false, ...}: + +stdenv.mkDerivation { + name = "libjpeg-6b"; + + builder = ./builder.sh; + + src = fetchurl { + url = http://www.ijg.org/files/jpegsrc.v6b.tar.gz; + md5 = "dbd5f3b47ed13132f04c685d608a7547"; + }; + + inherit libtool; + + configureFlags = "--enable-shared ${if static then " --enable-static" else ""}"; + + # Required for building of dynamic libraries on Darwin. + patches = [ + (fetchurl { + url = http://svn.macports.org/repository/macports/trunk/dports/graphics/jpeg/files/patch-ltconfig; + md5 = "e6725fa4a09aa1de4ca75343fd0f61d5"; + }) + (fetchurl { + url = http://svn.macports.org/repository/macports/trunk/dports/graphics/jpeg/files/patch-ltmain.sh; + #md5 = "489986ad8e7a93aef036766b25f321d5"; + md5 = "092a12aeb0c386dd7dae059109d950ba"; + }) + ]; +} diff --git a/pkgs/development/libraries/libjpeg/builder.sh b/pkgs/development/libraries/libjpeg/builder.sh new file mode 100755 index 00000000000..58ca9a790ba --- /dev/null +++ b/pkgs/development/libraries/libjpeg/builder.sh @@ -0,0 +1,25 @@ +source $stdenv/setup + +preConfigure() { + # Workarounds for the ancient libtool shipped by libjpeg. + ln -s $libtool/bin/libtool . + cp $libtool/share/libtool/config.guess . + cp $libtool/share/libtool/config.sub . +} + +preInstall() { + mkdir $out + mkdir $out/bin + mkdir $out/lib + mkdir $out/include + mkdir $out/man + mkdir $out/man/man1 +} + +patchPhase() { + for i in $patches; do + patch < $i + done +} + +genericBuild diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57348193e91..be0c666f2d8 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" "";