Unverified Commit 5018a7b1 authored by adisbladis's avatar adisbladis Committed by GitHub
Browse files

stdenv: Don't copy dependency input lists when type checking (#503596)

parents de2e764a b5bb13f9

pkgs/stdenv/generic/make-derivation.nix

+8 −6
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ let 
    filterAttrs

    getDev

    head

    imap1

    foldl'

    isAttrs

    isBool

    isDerivation
@@ -44,6 +44,8 @@ let 
    toFunction

    unique

    zipAttrsWith

    isPath

    seq

    ;



  inherit (import ../../build-support/lib/cmake.nix { inherit lib stdenv; }) makeCMakeFlags;
@@ -436,17 +438,17 @@ let 
      checkDependencyList = checkDependencyList' [ ];

      checkDependencyList' =

        positions: name: deps:

        imap1 (

        seq (foldl' (

          index: dep:

          if dep == null || isDerivation dep || isString dep || builtins.isPath dep then

            dep

          if dep == null || isDerivation dep || isString dep || isPath dep then

            index + 1

          else if isList dep then

            checkDependencyList' ([ index ] ++ positions) name dep

            seq (checkDependencyList' ([ index ] ++ positions) name dep) (index + 1)

          else

            throw "Dependency is not of a valid type: ${

              concatMapStrings (ix: "element ${toString ix} of ") ([ index ] ++ positions)

            }${name} for ${attrs.name or attrs.pname}"

        ) deps;

        ) 1 deps) deps;

    in

    if erroneousHardeningFlags != [ ] then

      abort (