diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-14 20:30:58 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-17 14:40:51 +0100 |
| commit | 0c3197ec08ca4dd35f555edfd0174b397169cffe (patch) | |
| tree | e3c10b1abe69c6c4e2b5f9df409be9957fe4ddec /pkgs | |
| parent | 46f2b49b443a78b4d686827192aaf79df87a6f1e (diff) | |
| download | nixpkgs-0c3197ec08ca4dd35f555edfd0174b397169cffe.tar nixpkgs-0c3197ec08ca4dd35f555edfd0174b397169cffe.tar.gz nixpkgs-0c3197ec08ca4dd35f555edfd0174b397169cffe.tar.bz2 nixpkgs-0c3197ec08ca4dd35f555edfd0174b397169cffe.tar.lz nixpkgs-0c3197ec08ca4dd35f555edfd0174b397169cffe.tar.xz nixpkgs-0c3197ec08ca4dd35f555edfd0174b397169cffe.tar.zst nixpkgs-0c3197ec08ca4dd35f555edfd0174b397169cffe.zip | |
Revert "python.pkgs.matplotlib: use pkgs.pkgconfig"
This reverts commit c78f98db56b580bada5c56ef38793f4fa5c140b6.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/matplotlib/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index d4c8e970c50..718eb2de425 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -35,15 +35,13 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python which sphinx stdenv ] ++ stdenv.lib.optional enableGhostscript ghostscript ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver - libpng mock pytz ] + libpng pkgconfig mock pytz ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b5fccaece8..c070b9c2297 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3058,7 +3058,6 @@ in { in callPackage path { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; - inherit (pkgs) pkgconfig; }; matrix-client = callPackage ../development/python-modules/matrix-client { }; |