Author: chaoflow
Date: Sun Feb 26 17:23:50 2012
New Revision: 32596
URL: https://nixos.org/websvn/nix/?rev=32596&sc=1
Log:
separate libxml2 python bindings, added libconvOrLibC dependency
authored by: chaoflow, goibhniu
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
Sun Feb 26 17:23:47 2012 (r32595)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/libxml2/default.nix
Sun Feb 26 17:23:50 2012 (r32596)
@@ -1,6 +1,4 @@
-{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true }:
-
-assert pythonSupport -> python != null;
+{ stdenv, fetchurl, libiconvOrLibc, zlib }:
stdenv.mkDerivation {
name = "libxml2-2.7.7";
@@ -10,15 +8,11 @@
sha256 = "03kkknm7xl77qfdig8mzalsi8ljsyblzin18gy3h8zranffrpyzs";
};
- configureFlags = ''
- ${if pythonSupport then "--with-python=${python}" else ""}
- '';
-
- propagatedBuildInputs = [zlib];
+ propagatedBuildInputs = [ libiconvOrLibc zlib ];
setupHook = ./setup-hook.sh;
- passthru = {inherit pythonSupport;};
+ passthru = { libiconv = libiconvOrLibc; };
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 Sun Feb
26 17:23:47 2012 (r32595)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Sun Feb
26 17:23:50 2012 (r32596)
@@ -4234,13 +4234,9 @@
libxmi = callPackage ../development/libraries/libxmi { };
- libxml2 = callPackage ../development/libraries/libxml2 {
- pythonSupport = false;
- };
+ libxml2 = callPackage ../development/libraries/libxml2 { };
- libxml2Python = libxml2.override {
- pythonSupport = true;
- };
+ libxml2Python = pythonPackages.libxml2;
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 Sun Feb
26 17:23:47 2012 (r32595)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix Sun Feb
26 17:23:50 2012 (r32596)
@@ -665,6 +665,35 @@
});
+ 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
