fontforge: move to by-name

+17 -34
+6
pkgs/by-name/fo/fontforge-gtk/package.nix
··· 1 + { fontforge }: 2 + 3 + fontforge.override { 4 + withSpiro = true; 5 + withGTK = true; 6 + }
+10 -20
pkgs/tools/misc/fontforge/default.nix pkgs/by-name/fo/fontforge/package.nix
··· 6 6 cmake, 7 7 uthash, 8 8 pkg-config, 9 - python, 9 + makeWrapper, 10 + python3, 10 11 freetype, 11 12 zlib, 12 13 glib, ··· 27 28 withGUI ? withGTK, 28 29 withPython ? true, 29 30 withExtras ? true, 30 - Carbon, 31 - Cocoa, 32 - makeWrapper, 33 31 }: 34 32 35 33 assert withGTK -> withGUI; 36 34 37 35 let 38 - py = python.withPackages (ps: with ps; [ setuptools ]); 36 + py = python3.withPackages (ps: with ps; [ setuptools ]); 39 37 in 40 38 stdenv.mkDerivation rec { 41 39 pname = "fontforge"; 42 40 version = "20230101"; 43 41 44 42 src = fetchFromGitHub { 45 - owner = pname; 46 - repo = pname; 43 + owner = "fontforge"; 44 + repo = "fontforge"; 47 45 rev = version; 48 46 sha256 = "sha256-/RYhvL+Z4n4hJ8dmm+jbA1Ful23ni2DbCRZC5A3+pP0="; 49 47 }; ··· 98 96 libxml2 99 97 ] 100 98 ++ lib.optionals withSpiro [ libspiro ] 101 - ++ lib.optionals withGUI [ 102 - gtk3 103 - cairo 104 - pango 105 - ] 106 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 107 - Carbon 108 - Cocoa 109 - ]; 99 + ++ lib.optionals withGUI [ gtk3 cairo pango ]; 110 100 111 101 cmakeFlags = 112 102 [ "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" ] ··· 130 120 rm -r "$out/share/fontforge/python" 131 121 ''; 132 122 133 - meta = with lib; { 123 + meta = { 134 124 description = "Font editor"; 135 125 homepage = "https://fontforge.github.io"; 136 - platforms = platforms.all; 137 - license = licenses.bsd3; 138 - maintainers = with maintainers; [ erictapen ulysseszhan ]; 126 + platforms = lib.platforms.all; 127 + license = lib.licenses.bsd3; 128 + maintainers = with lib.maintainers; [ erictapen ulysseszhan ]; 139 129 }; 140 130 }
pkgs/tools/misc/fontforge/fontforge-fonttools.nix pkgs/by-name/fo/fontforge-fonttools/package.nix
pkgs/tools/misc/fontforge/replace-distutils.patch pkgs/by-name/fo/fontforge/replace-distutils.patch
-13
pkgs/top-level/all-packages.nix
··· 3374 3374 3375 3375 fastlane = callPackage ../tools/admin/fastlane { }; 3376 3376 3377 - fontforge = lowPrio (callPackage ../tools/misc/fontforge { 3378 - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; 3379 - python = python3; 3380 - }); 3381 - fontforge-gtk = fontforge.override { 3382 - withSpiro = true; 3383 - withGTK = true; 3384 - gtk3 = gtk3-x11; 3385 - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; 3386 - }; 3387 - 3388 - fontforge-fonttools = callPackage ../tools/misc/fontforge/fontforge-fonttools.nix { }; 3389 - 3390 3377 fontmatrix = libsForQt5.callPackage ../applications/graphics/fontmatrix { }; 3391 3378 3392 3379 fox = callPackage ../development/libraries/fox {};
+1 -1
pkgs/top-level/python-packages.nix
··· 4846 4846 (pythonOlder "3.10") 4847 4847 (toPythonModule (pkgs.fontforge.override { 4848 4848 withPython = true; 4849 - inherit python; 4849 + python3 = python; 4850 4850 })); 4851 4851 4852 4852 fontmath = callPackage ../development/python-modules/fontmath { };