diff --git a/pkgs/tools/misc/fontforge/fontforge-fonttools.nix b/pkgs/by-name/fo/fontforge-fonttools/package.nix similarity index 100% rename from pkgs/tools/misc/fontforge/fontforge-fonttools.nix rename to pkgs/by-name/fo/fontforge-fonttools/package.nix diff --git a/pkgs/by-name/fo/fontforge-gtk/package.nix b/pkgs/by-name/fo/fontforge-gtk/package.nix new file mode 100644 index 000000000000..08bcf0eac9d0 --- /dev/null +++ b/pkgs/by-name/fo/fontforge-gtk/package.nix @@ -0,0 +1,6 @@ +{ fontforge }: + +fontforge.override { + withSpiro = true; + withGTK = true; +} diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/by-name/fo/fontforge/package.nix similarity index 88% rename from pkgs/tools/misc/fontforge/default.nix rename to pkgs/by-name/fo/fontforge/package.nix index 33270a32bc85..2fde4628826d 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/by-name/fo/fontforge/package.nix @@ -6,7 +6,8 @@ cmake, uthash, pkg-config, - python, + makeWrapper, + python3, freetype, zlib, glib, @@ -27,23 +28,20 @@ withGUI ? withGTK, withPython ? true, withExtras ? true, - Carbon, - Cocoa, - makeWrapper, }: assert withGTK -> withGUI; let - py = python.withPackages (ps: with ps; [ setuptools ]); + py = python3.withPackages (ps: with ps; [ setuptools ]); in stdenv.mkDerivation rec { pname = "fontforge"; version = "20230101"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "fontforge"; + repo = "fontforge"; rev = version; sha256 = "sha256-/RYhvL+Z4n4hJ8dmm+jbA1Ful23ni2DbCRZC5A3+pP0="; }; @@ -98,15 +96,7 @@ stdenv.mkDerivation rec { libxml2 ] ++ lib.optionals withSpiro [ libspiro ] - ++ lib.optionals withGUI [ - gtk3 - cairo - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa - ]; + ++ lib.optionals withGUI [ gtk3 cairo pango ]; cmakeFlags = [ "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" ] @@ -130,11 +120,11 @@ stdenv.mkDerivation rec { rm -r "$out/share/fontforge/python" ''; - meta = with lib; { + meta = { description = "Font editor"; homepage = "https://fontforge.github.io"; - platforms = platforms.all; - license = licenses.bsd3; - maintainers = with maintainers; [ erictapen ulysseszhan ]; + platforms = lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ erictapen ulysseszhan ]; }; } diff --git a/pkgs/tools/misc/fontforge/replace-distutils.patch b/pkgs/by-name/fo/fontforge/replace-distutils.patch similarity index 100% rename from pkgs/tools/misc/fontforge/replace-distutils.patch rename to pkgs/by-name/fo/fontforge/replace-distutils.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 705985a81d4e..bf1764a2fa4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3374,19 +3374,6 @@ with pkgs; fastlane = callPackage ../tools/admin/fastlane { }; - fontforge = lowPrio (callPackage ../tools/misc/fontforge { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - python = python3; - }); - fontforge-gtk = fontforge.override { - withSpiro = true; - withGTK = true; - gtk3 = gtk3-x11; - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - }; - - fontforge-fonttools = callPackage ../tools/misc/fontforge/fontforge-fonttools.nix { }; - fontmatrix = libsForQt5.callPackage ../applications/graphics/fontmatrix { }; fox = callPackage ../development/libraries/fox {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1a026f7d4d41..659ca628a80a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4846,7 +4846,7 @@ self: super: with self; { (pythonOlder "3.10") (toPythonModule (pkgs.fontforge.override { withPython = true; - inherit python; + python3 = python; })); fontmath = callPackage ../development/python-modules/fontmath { };