diff --git a/pkgs/by-name/no/noto-fonts-color-emoji/package.nix b/pkgs/by-name/no/noto-fonts-color-emoji/package.nix index 39862609e894..d5a9874ded54 100644 --- a/pkgs/by-name/no/noto-fonts-color-emoji/package.nix +++ b/pkgs/by-name/no/noto-fonts-color-emoji/package.nix @@ -7,18 +7,11 @@ cairo, imagemagick, zopfli, + nototools, pngquant, which, }: -let - emojiPythonEnv = buildPackages.python3.withPackages ( - p: with p; [ - fonttools - nototools - ] - ); -in stdenvNoCC.mkDerivation rec { pname = "noto-fonts-color-emoji"; version = "2.047"; @@ -39,9 +32,10 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ imagemagick zopfli + nototools pngquant which - emojiPythonEnv + buildPackages.python3.pkgs.fonttools ]; postPatch = '' diff --git a/pkgs/development/python-modules/nototools/default.nix b/pkgs/by-name/no/nototools/package.nix similarity index 68% rename from pkgs/development/python-modules/nototools/default.nix rename to pkgs/by-name/no/nototools/package.nix index 3f8c679d2a4b..26d1e7348b5f 100644 --- a/pkgs/development/python-modules/nototools/default.nix +++ b/pkgs/by-name/no/nototools/package.nix @@ -1,45 +1,14 @@ { fetchFromGitHub, lib, - buildPythonPackage, - pythonOlder, - afdko, - appdirs, - attrs, - booleanoperations, - brotlipy, - click, - defcon, - fontmath, - fontparts, - fontpens, - fonttools, - lxml, - mutatormath, - pathspec, - psautohint, - pyclipper, - pytz, - regex, - scour, - toml, - typed-ast, - ufonormalizer, - ufoprocessor, - unicodedata2, - zopfli, - pillow, - six, bash, - setuptools-scm, + python3Packages, }: -buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "nototools"; version = "0.2.20"; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "googlefonts"; repo = "nototools"; @@ -51,9 +20,9 @@ buildPythonPackage rec { sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py ''; - nativeBuildInputs = [ setuptools-scm ]; + build-system = with python3Packages; [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ afdko appdirs attrs @@ -82,8 +51,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pillow - six + python3Packages.pillow + python3Packages.six bash ]; diff --git a/pkgs/by-name/tw/twitter-color-emoji/package.nix b/pkgs/by-name/tw/twitter-color-emoji/package.nix index 5ddcb8a7d613..ae999224b791 100644 --- a/pkgs/by-name/tw/twitter-color-emoji/package.nix +++ b/pkgs/by-name/tw/twitter-color-emoji/package.nix @@ -7,6 +7,7 @@ fetchFromGitHub, cairo, imagemagick, + nototools, pkg-config, pngquant, python3, @@ -25,14 +26,6 @@ let rev = "v${version}"; hash = "sha256-FLOqXDpSFyClBlG5u3IRL0EKeu1mckCfRizJh++IWxo="; }; - - pythonEnv = python3.withPackages ( - ps: with ps; [ - fonttools - nototools - ] - ); - in stdenv.mkDerivation rec { pname = "twitter-color-emoji"; @@ -52,10 +45,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cairo + python3.pkgs.fonttools imagemagick + nototools pkg-config pngquant - pythonEnv which zopfli ]; diff --git a/pkgs/by-name/wh/whatsapp-emoji-font/package.nix b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix index d83050188c99..cde77df69bcd 100644 --- a/pkgs/by-name/wh/whatsapp-emoji-font/package.nix +++ b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix @@ -4,8 +4,8 @@ fetchFromGitHub, imagemagick, nix-update-script, + nototools, pngquant, - python3Packages, which, zopfli, }: @@ -29,8 +29,8 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ imagemagick + nototools pngquant - python3Packages.nototools which zopfli ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 764bab2093a5..48f36fe8e1eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10123,8 +10123,6 @@ self: super: with self; { notobuilder = callPackage ../development/python-modules/notobuilder { }; - nototools = callPackage ../development/python-modules/nototools { }; - notus-scanner = callPackage ../development/python-modules/notus-scanner { }; nox = callPackage ../development/python-modules/nox { };