dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fontforge: enable Carbon which is required on OSX

Browse Source
This commit is contained in:
Dmitry Kalinkin 2016-09-03 23:38:23 -04:00
parent 8d977ead38
commit 810787238d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/misc/fontforge/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
python freetype zlib glib libungif libpng libjpeg libtiff libxml2 python freetype zlib glib libungif libpng libjpeg libtiff libxml2
] ]
++ lib.optionals withGTK [ gtk2 pango ] ++ lib.optionals withGTK [ gtk2 pango ]
++ lib.optionals (withGTK && stdenv.isDarwin) [ Carbon Cocoa ]; ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
configureFlags = configureFlags =
lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ] lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ]

4
pkgs/top-level/all-packages.nix
View File

@ -1617,7 +1617,9 @@ in
flvtool2 = callPackage ../tools/video/flvtool2 { }; flvtool2 = callPackage ../tools/video/flvtool2 { };
fontforge = lowPrio (callPackage ../tools/misc/fontforge { }); fontforge = lowPrio (callPackage ../tools/misc/fontforge {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
});
fontforge-gtk = callPackage ../tools/misc/fontforge { fontforge-gtk = callPackage ../tools/misc/fontforge {
withGTK = true; withGTK = true;
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;