dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

re-added libjpeg62 for chrome, updated chrome

Browse Source 
svn path=/nixpkgs/trunk/; revision=19199
This commit is contained in:
Rob Vermaas 2010-01-04 07:47:32 +00:00
parent c62430f6a6
commit c5157f7d9d
4 changed files with 68 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -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

29
pkgs/development/libraries/libjpeg/62.nix Normal file
View File

@ -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";
})
];
}

25
pkgs/development/libraries/libjpeg/builder.sh Executable file
View File

@ -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

8
pkgs/top-level/all-packages.nix
View File

@ -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" "";