diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-02-02 10:57:35 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-02-02 11:01:13 +0100 |
commit | 9c4d6561029aebd8e7ad96f24e256d0de7ae8097 (patch) | |
tree | 391278ee3d54627c7b5ff5ad97595b84ea19034d /pkgs | |
parent | 32a4081a7f8a162cb10f3afb8cec57165f05e0b2 (diff) | |
download | nixlib-9c4d6561029aebd8e7ad96f24e256d0de7ae8097.tar nixlib-9c4d6561029aebd8e7ad96f24e256d0de7ae8097.tar.gz nixlib-9c4d6561029aebd8e7ad96f24e256d0de7ae8097.tar.bz2 nixlib-9c4d6561029aebd8e7ad96f24e256d0de7ae8097.tar.lz nixlib-9c4d6561029aebd8e7ad96f24e256d0de7ae8097.tar.xz nixlib-9c4d6561029aebd8e7ad96f24e256d0de7ae8097.tar.zst nixlib-9c4d6561029aebd8e7ad96f24e256d0de7ae8097.zip |
pango: major update 1.32.5 -> 1.36.1, enable tests
Also propagate stuff in *.pc dependencies.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/pango/default.nix | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index f57ee931fafa..2db977e0f344 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,24 +1,28 @@ -{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz, fontconfig -, libintlOrEmpty, gobjectIntrospection }: - +{ stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng, harfbuzz +, fontconfig, freetype, libintlOrEmpty, gobjectIntrospection +}: + +let + ver_maj = "1.36"; + ver_min = "1"; +in stdenv.mkDerivation rec { - name = "pango-1.32.5"; #.6 and higher need a not-yet-stable fontconfig (!) + name = "pango-${ver_maj}.${ver_min}"; src = fetchurl { - url = "mirror://gnome/sources/pango/1.32/${name}.tar.xz"; - sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx"; + url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz"; + sha256 = "1y2r1v4m8g4afggjd1siz0ri175p64myz9d2ks58grlrvhfbbr22"; }; - buildInputs = [ gobjectIntrospection ] - ++ stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ]; - - nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gobjectIntrospection ]; - propagatedBuildInputs = [ x11 glib cairo libpng harfbuzz ] ++ libintlOrEmpty; + propagatedBuildInputs = [ x11 glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty; enableParallelBuilding = true; + doCheck = true; + postInstall = "rm -rf $out/share/gtk-doc"; meta = { |