Merge pull request #32489 from orivej/ed

[WIP] ed: fix cross build
This commit is contained in:
John Ericson 2018-01-09 17:09:54 -05:00 committed by GitHub
commit b850eb3404
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,7 +2,7 @@
, buildPlatform, hostPlatform , buildPlatform, hostPlatform
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (rec {
name = "ed-${version}"; name = "ed-${version}";
version = "1.14.2"; version = "1.14.2";
@ -36,4 +36,9 @@ stdenv.mkDerivation rec {
maintainers = [ ]; maintainers = [ ];
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
}; };
} } // stdenv.lib.optionalAttrs (hostPlatform != buildPlatform) {
# This may be moved above during a stdenv rebuild.
preConfigure = ''
configureFlagsArray+=("CC=$CC")
'';
})