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

libxml2: Don't use stdenv.cross

Browse Source
This commit is contained in:
John Ericson 2017-02-10 23:48:28 -05:00 committed by John Ericson
parent 6916f24e84
commit 8ca8293dbc
1 changed files with 5 additions and 3 deletions

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

@ -1,7 +1,9 @@
{ stdenv, lib, fetchurl, fetchpatch { stdenv, lib, fetchurl, fetchpatch
, zlib, xz, python2, findXMLCatalogs, libiconv , zlib, xz, python2, findXMLCatalogs, libiconv
, pythonSupport ? (! stdenv ? cross) , buildPlatform, hostPlatform
, icuSupport ? false, icu ? null }: , pythonSupport ? buildPlatform == hostPlatform
, icuSupport ? false, icu ? null
}:
let let
python = python2; python = python2;
@ -45,7 +47,7 @@ in stdenv.mkDerivation rec {
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;
crossAttrs = lib.optionalAttrs (stdenv.cross.libc == "msvcrt") { crossAttrs = lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
# creating the DLL is broken ATM # creating the DLL is broken ATM
dontDisableStatic = true; dontDisableStatic = true;
configureFlags = configureFlags ++ [ "--disable-shared" ]; configureFlags = configureFlags ++ [ "--disable-shared" ];