diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-15 20:32:23 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-10-29 13:47:03 +0100 |
| commit | a51aa02c7849229cac80c4697d026650a5bd8a73 (patch) | |
| tree | 73c5509a05699aa8adac6986f5a89c850c609ab6 | |
| parent | 0b32782d33c42b32cde106762a24b70e76f5b55f (diff) | |
| download | nixpkgs-a51aa02c7849229cac80c4697d026650a5bd8a73.tar nixpkgs-a51aa02c7849229cac80c4697d026650a5bd8a73.tar.gz nixpkgs-a51aa02c7849229cac80c4697d026650a5bd8a73.tar.bz2 nixpkgs-a51aa02c7849229cac80c4697d026650a5bd8a73.tar.lz nixpkgs-a51aa02c7849229cac80c4697d026650a5bd8a73.tar.xz nixpkgs-a51aa02c7849229cac80c4697d026650a5bd8a73.tar.zst nixpkgs-a51aa02c7849229cac80c4697d026650a5bd8a73.zip | |
libxml2: use python3 for build and as default for bindings
Changing the default may cause breakage, however, users should have already switched to `pythonPackages.libxml2` long ago.
| -rw-r--r-- | pkgs/development/libraries/libxml2/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 04954f3e1f5..2d2fb89d595 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,15 +1,12 @@ { stdenv, lib, fetchurl -, zlib, xz, python2, ncurses, findXMLCatalogs +, zlib, xz, python, ncurses, findXMLCatalogs , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform , icuSupport ? false, icu ? null , enableShared ? stdenv.hostPlatform.libc != "msvcrt" , enableStatic ? !enableShared, }: -let - python = python2; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "libxml2"; version = "2.9.9"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2a80fdc0b6..cc35ae589c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12723,7 +12723,9 @@ in 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 name = "libxml2+py-${res.libxml2.version}"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d723bdb2b63..0a171d3a9cf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3689,7 +3689,7 @@ in { libplist = disabledIf isPy3k (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 (toPythonModule (pkgs.libxslt.override{pythonSupport=true; python2=python; inherit (self) libxml2;})).py; |