re-added libjpeg62 for chrome, updated chrome

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

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

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