From 10a0b42996a75f8f09108b5f483a41d11e062875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 12 Aug 2021 11:30:23 +0200 Subject: [PATCH] fontforge: remove ? null on darwin packages and format a little --- pkgs/tools/misc/fontforge/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 5f64057c46c3..0f66fa55acad 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -7,7 +7,7 @@ , withGUI ? withGTK , withPython ? true , withExtras ? true -, Carbon ? null, Cocoa ? null +, Carbon, Cocoa }: assert withGTK -> withGUI; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { readline uthash woff2 zeromq libuninameslist python freetype zlib glib giflib libpng libjpeg libtiff libxml2 ] - ++ lib.optionals withSpiro [libspiro] + ++ lib.optionals withSpiro [ libspiro ] ++ lib.optionals withGUI [ gtk3 cairo pango ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; @@ -71,11 +71,11 @@ stdenv.mkDerivation rec { rm -r "$out/share/fontforge/python" ''; - meta = { + meta = with lib; { description = "A font editor"; - homepage = "http://fontforge.github.io"; - platforms = lib.platforms.all; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.erictapen ]; + homepage = "https://fontforge.github.io"; + platforms = platforms.all; + license = licenses.bsd3; + maintainers = [ maintainers.erictapen ]; }; }