public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #101022 from jtojnar/pycairo-drop-xlibs

Browse Source 
python3.pkgs.pycairo: drop xlibs
This commit is contained in:
Jan Tojnar 2020-10-20 13:54:32 +02:00 committed by GitHub
commit d4975d23f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/python-modules/pycairo/default.nix
View File

@ -1,4 +1,13 @@
{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy3k }: { lib
, fetchFromGitHub
, meson
, ninja
, buildPythonPackage
, pytestCheckHook
, pkg-config
, cairo
, isPy3k
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pycairo"; pname = "pycairo";
@ -16,22 +25,25 @@ buildPythonPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja
pkgconfig pkg-config
]; ];
buildInputs = [ buildInputs = [
cairo cairo
xlibsWrapper
]; ];
checkInputs = [ pytest ]; checkInputs = [
pytestCheckHook
];
mesonFlags = [ "-Dpython=${if isPy3k then "python3" else "python"}" ]; mesonFlags = [
"-Dpython=${if isPy3k then "python3" else "python"}"
];
meta = with lib; { meta = with lib; {
description = "Python 2/3 bindings for cairo"; description = "Python 2/3 bindings for cairo";
homepage = "https://pycairo.readthedocs.io/"; homepage = "https://pycairo.readthedocs.io/";
license = with licenses; [ lgpl2 mpl11 ]; license = with licenses; [ lgpl21Only mpl11 ];
platforms = lib.platforms.linux ++ lib.platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
}; };
} }

2
pkgs/top-level/python-packages.nix
View File

@ -4818,7 +4818,7 @@ in {
pybullet = callPackage ../development/python-modules/pybullet { }; pybullet = callPackage ../development/python-modules/pybullet { };
pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkgconfig; }; pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkg-config; };
pycallgraph = callPackage ../development/python-modules/pycallgraph { }; pycallgraph = callPackage ../development/python-modules/pycallgraph { };