@ -73,15 +73,8 @@ rec {
} ;
in stdenv // {
mkDerivation =
{ name ? " " , buildInputs ? [ ] , nativeBuildInputs ? [ ]
{ buildInputs ? [ ] , nativeBuildInputs ? [ ]
, propagatedBuildInputs ? [ ] , propagatedNativeBuildInputs ? [ ]
, # Disabling the tests by default when cross compiling, as usually the
# tests rely on being able to run produced binaries.
doCheck ? false
, configureFlags ? [ ]
, # Target is not included by default because most programs don't care.
# Including it then would cause needless massive rebuilds.
configurePlatforms ? args . crossAttrs . configurePlatforms or [ " b u i l d " " h o s t " ]
, selfNativeBuildInput ? args . crossAttrs . selfNativeBuildInput or false
, . . .
} @ args :
@ -106,7 +99,6 @@ rec {
nativeInputsFromBuildInputs = stdenv . lib . filter hostAsNativeDrv buildInputsNotNull ;
in
stdenv . mkDerivation ( args // {
name = name + " - " + hostPlatform . config ;
nativeBuildInputs = nativeBuildInputs
++ nativeInputsFromBuildInputs
++ stdenv . lib . optional selfNativeBuildInput nativeDrv
@ -116,15 +108,6 @@ rec {
++ stdenv . lib . optional ( hostPlatform . config == " a a r c h 6 4 - l i n u x - g n u " ) pkgs . updateAutotoolsGnuConfigScriptsHook
;
inherit doCheck ;
# This parameter is sometimes a string and sometimes a list, yuck
configureFlags = let inherit ( stdenv . lib ) optional elem ; in
( if stdenv . lib . isString configureFlags then [ configureFlags ] else configureFlags )
++ optional ( elem " b u i l d " configurePlatforms ) " - - b u i l d = ${ buildPlatform . config } "
++ optional ( elem " h o s t " configurePlatforms ) " - - h o s t = ${ hostPlatform . config } "
++ optional ( elem " t a r g e t " configurePlatforms ) " - - t a r g e t = ${ targetPlatform . config } " ;
# Cross-linking dynamic libraries, every buildInput should
# be propagated because ld needs the -rpath-link to find
# any library needed to link the program dynamically at