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/development | |
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/development')
-rw-r--r-- | pkgs/development/libraries/libjpeg/62.nix | 29 | ||||
-rwxr-xr-x | pkgs/development/libraries/libjpeg/builder.sh | 25 |
2 files changed, 54 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libjpeg/62.nix b/pkgs/development/libraries/libjpeg/62.nix new file mode 100644 index 000000000000..fb92fe995b66 --- /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 000000000000..58ca9a790baf --- /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 |