diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-09-26 13:15:33 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-09-26 13:15:33 +0000 |
| commit | 63b48b0b3044bf9bd70355845b52efe0db339e49 (patch) | |
| tree | 4d7c76dbeef2c9f8b905d0d8fcb168d03cb2864c /pkgs/development/libraries | |
| parent | a9da9ae89d2c397b2000403db211262f773d27e2 (diff) | |
| parent | 5da4cd69fc527e0f8355b78394d55d150b513640 (diff) | |
| download | nixlib-63b48b0b3044bf9bd70355845b52efe0db339e49.tar nixlib-63b48b0b3044bf9bd70355845b52efe0db339e49.tar.gz nixlib-63b48b0b3044bf9bd70355845b52efe0db339e49.tar.bz2 nixlib-63b48b0b3044bf9bd70355845b52efe0db339e49.tar.lz nixlib-63b48b0b3044bf9bd70355845b52efe0db339e49.tar.xz nixlib-63b48b0b3044bf9bd70355845b52efe0db339e49.tar.zst nixlib-63b48b0b3044bf9bd70355845b52efe0db339e49.zip | |
svn merge nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=29497
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/imlib2/default.nix | 16 |
2 files changed, 18 insertions, 6 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 62e907264d5e..ca3e53e64f40 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -5,6 +5,7 @@ , gobjectSupport ? true, glib , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs , zlib, libpng, pixman, libxcb ? null, xcbutil ? null +, gettext }: assert postscriptSupport -> zlib != null; @@ -22,7 +23,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig x11 fontconfig pixman xlibs.libXrender ] ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ] - ++ stdenv.lib.optional gobjectSupport glib; + ++ stdenv.lib.optional gobjectSupport glib + + # On non-GNU systems we need GNU Gettext for libintl. + ++ stdenv.lib.optional (!stdenv.isLinux) gettext; propagatedBuildInputs = [ freetype ] ++ @@ -62,5 +66,7 @@ stdenv.mkDerivation rec { homepage = http://cairographics.org/; licenses = [ "LGPLv2+" "MPLv1" ]; + + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index d5c5424c077d..83adb16bbc8d 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,12 +1,18 @@ { stdenv, fetchurl, x11, libjpeg, libtiff, libungif, libpng, bzip2, pkgconfig }: -stdenv.mkDerivation { - name = "imlib2-1.4.4"; +stdenv.mkDerivation rec { + name = "imlib2-1.4.5"; src = fetchurl { - url = mirror://sourceforge/enlightenment/imlib2-1.4.4.tar.gz; - sha256 = "163162aifak8ya17brzqwjlr8ywz40s2s3573js5blcc1g4m5pm4"; + url = "mirror://sourceforge/enlightenment/${name}.tar.bz2"; + sha256 = "0nllbhf8vfwdm40z35yj27n83k2mjf5vbd62khad4f0qjf9hsw14"; }; - buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 pkgconfig ]; + buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 ]; + + buildNativeInputs = [ pkgconfig ]; + + meta = { + platforms = stdenv.lib.platforms.gnu; # random choice + }; } |