public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fontforge-gtk: fix darwin build

Browse Source
This commit is contained in:
Matthew Bauer 2016-08-11 22:19:25 -05:00
parent f8f4da3561
commit 07ca8027d9
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1603,6 +1603,7 @@ in
fontforge = lowPrio (callPackage ../tools/misc/fontforge { }); fontforge = lowPrio (callPackage ../tools/misc/fontforge { });
fontforge-gtk = callPackage ../tools/misc/fontforge { fontforge-gtk = callPackage ../tools/misc/fontforge {
withGTK = true; withGTK = true;
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
}; };
fontmatrix = callPackage ../applications/graphics/fontmatrix {}; fontmatrix = callPackage ../applications/graphics/fontmatrix {};