diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 03:20:09 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 03:20:09 +0200 |
| commit | cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f (patch) | |
| tree | 3fdd8ed1c086fb0ddf93941114bb1cbbb4659af9 /pkgs/development/libraries/pango | |
| parent | e7cccdbb139ccf2f9f170500f40c04a6237a2da1 (diff) | |
| parent | ed54a5b51dc9542df94f70b25a13d86d1f494e64 (diff) | |
| download | nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.gz nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.bz2 nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.lz nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.xz nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.zst nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.zip | |
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
Diffstat (limited to 'pkgs/development/libraries/pango')
| -rw-r--r-- | pkgs/development/libraries/pango/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 9d49b63fbac..0f84b382f4d 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -70,8 +70,8 @@ in stdenv.mkDerivation rec { Pango is a library for laying out and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is needed, though most of the work on Pango so - far has been done in the context of the GTK+ widget toolkit. - Pango forms the core of text and font handling for GTK+-2.x. + far has been done in the context of the GTK widget toolkit. + Pango forms the core of text and font handling for GTK. ''; homepage = https://www.pango.org/; |