diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2021-10-19 16:57:37 +0200 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2021-10-28 19:27:25 +0200 |
| commit | 51dd26733512b3d2393ab8ad307662ee64a5b29a (patch) | |
| tree | cdae28f08b56782dd362dfa22d8b4505f3a90f56 | |
| parent | 074a88834ae9053d4c355333c48c9d8b99d088ac (diff) | |
| download | nixpkgs-51dd26733512b3d2393ab8ad307662ee64a5b29a.tar nixpkgs-51dd26733512b3d2393ab8ad307662ee64a5b29a.tar.gz nixpkgs-51dd26733512b3d2393ab8ad307662ee64a5b29a.tar.bz2 nixpkgs-51dd26733512b3d2393ab8ad307662ee64a5b29a.tar.lz nixpkgs-51dd26733512b3d2393ab8ad307662ee64a5b29a.tar.xz nixpkgs-51dd26733512b3d2393ab8ad307662ee64a5b29a.tar.zst nixpkgs-51dd26733512b3d2393ab8ad307662ee64a5b29a.zip | |
python3Packages.zopfli: link against our zopfli instead of vendoring
https://github.com/fonttools/py-zopfli/pull/9
| -rw-r--r-- | pkgs/development/python-modules/zopfli/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix index 6a7808f4fe9..d7e9cf507f0 100644 --- a/pkgs/development/python-modules/zopfli/default.nix +++ b/pkgs/development/python-modules/zopfli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm, zopfli, pytest }: buildPythonPackage rec { pname = "zopfli"; @@ -12,6 +12,9 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; + buildInputs = [ zopfli ]; + USE_SYSTEM_ZOPFLI = "True"; + # doesn't work with pytestCheckHook checkInputs = [ pytest ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dd01245a179..9ad592468f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10079,7 +10079,9 @@ in { zope_testrunner = callPackage ../development/python-modules/zope_testrunner { }; - zopfli = callPackage ../development/python-modules/zopfli { }; + zopfli = callPackage ../development/python-modules/zopfli { + inherit (pkgs) zopfli; + }; zstandard = callPackage ../development/python-modules/zstandard { }; |