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

libxml2: use python3 for build and as default for bindings

Browse Source 
Changing the default may cause breakage, however, users should have
already switched to `pythonPackages.libxml2` long ago.
This commit is contained in:
Frederik Rietdijk 2019-06-15 20:32:23 +02:00 committed by Frederik Rietdijk
parent 0b32782d33
commit a51aa02c78
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/libxml2/default.nix
View File

@ -1,15 +1,12 @@
{ stdenv, lib, fetchurl { stdenv, lib, fetchurl
, zlib, xz, python2, ncurses, findXMLCatalogs , zlib, xz, python, ncurses, findXMLCatalogs
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
, icuSupport ? false, icu ? null , icuSupport ? false, icu ? null
, enableShared ? stdenv.hostPlatform.libc != "msvcrt" , enableShared ? stdenv.hostPlatform.libc != "msvcrt"
, enableStatic ? !enableShared, , enableStatic ? !enableShared,
}: }:
let stdenv.mkDerivation rec {
python = python2;
in stdenv.mkDerivation rec {
pname = "libxml2"; pname = "libxml2";
version = "2.9.9"; version = "2.9.9";

4
pkgs/top-level/all-packages.nix
View File

@ -12723,7 +12723,9 @@ in
libxmi = callPackage ../development/libraries/libxmi { }; libxmi = callPackage ../development/libraries/libxmi { };
libxml2 = callPackage ../development/libraries/libxml2 { }; libxml2 = callPackage ../development/libraries/libxml2 {
python = if stdenv.isDarwin then python2 else python3;
};
libxml2Python = pkgs.buildEnv { # slightly hacky libxml2Python = pkgs.buildEnv { # slightly hacky
name = "libxml2+py-${res.libxml2.version}"; name = "libxml2+py-${res.libxml2.version}";

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

@ -3689,7 +3689,7 @@ in {
libplist = disabledIf isPy3k libplist = disabledIf isPy3k
(toPythonModule (pkgs.libplist.override{python2Packages=self; })).py; (toPythonModule (pkgs.libplist.override{python2Packages=self; })).py;
libxml2 = toPythonModule (pkgs.libxml2.override{pythonSupport=true; python2=python;}).py; libxml2 = toPythonModule (pkgs.libxml2.override{pythonSupport=true; inherit python;}).py;
libxslt = disabledIf isPy3k libxslt = disabledIf isPy3k
(toPythonModule (pkgs.libxslt.override{pythonSupport=true; python2=python; inherit (self) libxml2;})).py; (toPythonModule (pkgs.libxslt.override{pythonSupport=true; python2=python; inherit (self) libxml2;})).py;