From 810787238df835befd442c538cfa34ad799f3e72 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 3 Sep 2016 23:38:23 -0400 Subject: [PATCH 1/3] fontforge: enable Carbon which is required on OSX --- pkgs/tools/misc/fontforge/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 54551b5af39e..388f603873ff 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { python freetype zlib glib libungif libpng libjpeg libtiff libxml2 ] ++ lib.optionals withGTK [ gtk2 pango ] - ++ lib.optionals (withGTK && stdenv.isDarwin) [ Carbon Cocoa ]; + ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; configureFlags = lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f94cd7257bbe..36e9a3287383 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1617,7 +1617,9 @@ in 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 { withGTK = true; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; From 1d4ed387516ae0fdadabc09335c1da6f51cd80e7 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 3 Sep 2016 23:39:43 -0400 Subject: [PATCH 2/3] fontforge: prevent configure from picking up xquartz installation --- pkgs/tools/misc/fontforge/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 388f603873ff..ba1154ab72d5 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { configureFlags = lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ] - ++ lib.optional withGTK "--enable-gtk2-use"; + ++ lib.optional withGTK "--enable-gtk2-use" + ++ lib.optional (!withGTK) "--without-x"; preConfigure = '' cp -r "${gnulib}" ./gnulib From 780d9d64815d5f525e637930d051b40c1aeb5250 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 3 Sep 2016 23:40:08 -0400 Subject: [PATCH 3/3] dejavu-fonts: enable on OSX --- pkgs/data/fonts/dejavu-fonts/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 6d9abdad2fa4..267a0b80a1f8 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { # See http://dejavu-fonts.org/wiki/License for details license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; }