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

libplist: disable python by default

Browse Source 
Introduced in 6449435b04, only Python 2 is supported and it does not seem to be used by anything.
This commit is contained in:
Jan Tojnar 2019-12-25 07:13:59 +01:00
parent a06925d8c6
commit 730c92d9e2
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/libplist/default.nix
View File

@ -1,8 +1,5 @@
{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig, python2Packages, glib }:
{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig, enablePython ? false, python, glib }:
let
inherit (python2Packages) python cython;
in
stdenv.mkDerivation rec {
pname = "libplist";
version = "2019-04-04";
@ -14,18 +11,23 @@ stdenv.mkDerivation rec {
sha256 = "19yw80yblq29i2jx9yb7bx0lfychy9dncri3fk4as35kq5bf26i8";
};
outputs = ["bin" "dev" "out" "py"];
outputs = ["bin" "dev" "out" ] ++ stdenv.lib.optional enablePython "py";
nativeBuildInputs = [
pkgconfig
python
cython
autoreconfHook
] ++ stdenv.lib.optionals enablePython [
python
python.pkgs.cython
];
configureFlags = stdenv.lib.optionals (!enablePython) [
"--without-cython"
];
propagatedBuildInputs = [ glib ];
postFixup = ''
postFixup = stdenv.lib.optionalString enablePython ''
moveToOutput "lib/${python.libPrefix}" "$py"
'';

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

@ -3863,7 +3863,7 @@ in {
libsavitar = callPackage ../development/python-modules/libsavitar { };
libplist = disabledIf isPy3k
(toPythonModule (pkgs.libplist.override{python2Packages=self; })).py;
(toPythonModule (pkgs.libplist.override { enablePython = true; inherit python; })).py;
libxml2 = (toPythonModule (pkgs.libxml2.override{pythonSupport=true; inherit python;})).py;