diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-02-10 23:48:28 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 00:51:59 -0400 |
| commit | 8ca8293dbc5982684d0ce87babf3daf7729e549a (patch) | |
| tree | d3eacff12e8e4fa1d21b318181df5a377666ad06 /pkgs/development/libraries/libxml2 | |
| parent | 6916f24e84ea4233f671ebc75de0ba10187c86b6 (diff) | |
| download | nixlib-8ca8293dbc5982684d0ce87babf3daf7729e549a.tar nixlib-8ca8293dbc5982684d0ce87babf3daf7729e549a.tar.gz nixlib-8ca8293dbc5982684d0ce87babf3daf7729e549a.tar.bz2 nixlib-8ca8293dbc5982684d0ce87babf3daf7729e549a.tar.lz nixlib-8ca8293dbc5982684d0ce87babf3daf7729e549a.tar.xz nixlib-8ca8293dbc5982684d0ce87babf3daf7729e549a.tar.zst nixlib-8ca8293dbc5982684d0ce87babf3daf7729e549a.zip | |
libxml2: Don't use stdenv.cross
Diffstat (limited to 'pkgs/development/libraries/libxml2')
| -rw-r--r-- | pkgs/development/libraries/libxml2/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index fb397ace7941..10dd4ee5dbe4 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,7 +1,9 @@ { stdenv, lib, fetchurl, fetchpatch , zlib, xz, python2, findXMLCatalogs, libiconv -, pythonSupport ? (! stdenv ? cross) -, icuSupport ? false, icu ? null }: +, buildPlatform, hostPlatform +, pythonSupport ? buildPlatform == hostPlatform +, icuSupport ? false, icu ? null +}: let python = python2; @@ -45,7 +47,7 @@ in stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; - crossAttrs = lib.optionalAttrs (stdenv.cross.libc == "msvcrt") { + crossAttrs = lib.optionalAttrs (hostPlatform.libc == "msvcrt") { # creating the DLL is broken ATM dontDisableStatic = true; configureFlags = configureFlags ++ [ "--disable-shared" ]; |