diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-08-29 22:41:10 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-08-29 22:41:10 +0200 |
commit | e6f1028340d7ab1c485efccbbbbaec4b9cb5712a (patch) | |
tree | 62816b99e5545538d011179b1b59932b4b2b0aae /pkgs/tools | |
parent | 3bfb354145e91aeb681697a954a858e9dce4ecd9 (diff) | |
parent | 40dc278ee0d6f5e6d3928a78569a98355c079ada (diff) | |
download | nixlib-e6f1028340d7ab1c485efccbbbbaec4b9cb5712a.tar nixlib-e6f1028340d7ab1c485efccbbbbaec4b9cb5712a.tar.gz nixlib-e6f1028340d7ab1c485efccbbbbaec4b9cb5712a.tar.bz2 nixlib-e6f1028340d7ab1c485efccbbbbaec4b9cb5712a.tar.lz nixlib-e6f1028340d7ab1c485efccbbbbaec4b9cb5712a.tar.xz nixlib-e6f1028340d7ab1c485efccbbbbaec4b9cb5712a.tar.zst nixlib-e6f1028340d7ab1c485efccbbbbaec4b9cb5712a.zip |
Merge: solve unfree xorg.fontbhttf
Fixes #17571.
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/misc/fontforge/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index c04b9255afcb..54551b5af39e 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -29,9 +29,8 @@ stdenv.mkDerivation rec { buildInputs = [ git autoconf automake gnum4 libtool perl pkgconfig gettext uthash python freetype zlib glib libungif libpng libjpeg libtiff libxml2 - pango ] - ++ lib.optionals withGTK [ gtk2 ] + ++ lib.optionals withGTK [ gtk2 pango ] ++ lib.optionals (withGTK && stdenv.isDarwin) [ Carbon Cocoa ]; configureFlags = |