Author: chaoflow
Date: Tue Feb 28 00:07:12 2012
New Revision: 32650
URL: https://nixos.org/websvn/nix/?rev=32650&sc=1
Log:
Revert "separate libxml2 python bindings, added libconvOrLibC dependency"
This reverts commit 614b18668433329cc5686c34b51a63e51c86c9f4.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/libxml2/default.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/libxml2/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/libxml2/default.nix
Tue Feb 28 00:07:08 2012 (r32649)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/libxml2/default.nix
Tue Feb 28 00:07:12 2012 (r32650)
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, libiconvOrLibc, zlib }:
+{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true }:
+
+assert pythonSupport -> python != null;
stdenv.mkDerivation {
name = "libxml2-2.7.7";
@@ -8,11 +10,15 @@
sha256 = "03kkknm7xl77qfdig8mzalsi8ljsyblzin18gy3h8zranffrpyzs";
};
- propagatedBuildInputs = [ libiconvOrLibc zlib ];
+ configureFlags = ''
+ ${if pythonSupport then "--with-python=${python}" else ""}
+ '';
+
+ propagatedBuildInputs = [zlib];
setupHook = ./setup-hook.sh;
- passthru = { libiconv = libiconvOrLibc; };
+ passthru = {inherit pythonSupport;};
meta = {
homepage = http://xmlsoft.org/;
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Tue Feb
28 00:07:08 2012 (r32649)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Tue Feb
28 00:07:12 2012 (r32650)
@@ -4234,9 +4234,13 @@
libxmi = callPackage ../development/libraries/libxmi { };
- libxml2 = callPackage ../development/libraries/libxml2 { };
+ libxml2 = callPackage ../development/libraries/libxml2 {
+ pythonSupport = false;
+ };
- libxml2Python = pythonPackages.libxml2;
+ libxml2Python = libxml2.override {
+ pythonSupport = true;
+ };
libxmlxx = callPackage ../development/libraries/libxmlxx {
inherit (gtkLibs) glibmm;
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix Tue Feb
28 00:07:08 2012 (r32649)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix Tue Feb
28 00:07:12 2012 (r32650)
@@ -665,35 +665,6 @@
});
- libxml2 = buildPythonPackage (rec {
- name = pkgs.libxml2.name;
- src = pkgs.libxml2.src;
-
- buildInputs = [ python ];
- propagatedBuildInputs = [ pkgs.libxml2 ];
-
- configureFlags = "--with-python=${python}";
-
- postConfigure = ''
- cd python
- sed -i setup.py \
- -e "s:^ROOT.*:ROOT = r'${pkgs.libxml2}':" \
- -e "s:^iconv_includes.*:iconv_includes= r'${pkgs.libxml2.libiconv}':"
- '';
-
- # has no tests
- doCheck = false;
-
- passthru = { lib = pkgs.libxml2; };
-
- meta = {
- homepage = http://xmlsoft.org/;
- description = "Python bindings for libxml2";
- license = "bsd";
- };
- });
-
-
lockfile = buildPythonPackage rec {
name = "lockfile-0.9.1";
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
