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; }; } diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 54551b5af39e..ba1154ab72d5 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -31,11 +31,12 @@ 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" ] - ++ lib.optional withGTK "--enable-gtk2-use"; + ++ lib.optional withGTK "--enable-gtk2-use" + ++ lib.optional (!withGTK) "--without-x"; preConfigure = '' cp -r "${gnulib}" ./gnulib diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bce6aaca50b8..62b068793416 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1625,7 +1625,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;