diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-06-22 12:02:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-22 12:02:08 +0000 |
| commit | fc5ef80184b43be6b626ce8f25b9d8a7121d41f8 (patch) | |
| tree | 092e975ee4b6fc3f484fe403d6d13c022bd86cd1 /pkgs/stdenv | |
| parent | ba285377b30f7ec776af06e48a8c3c7d322b827a (diff) | |
| parent | 73cb9342e87e5f2147f07c6335918b1be25deef0 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 40ad357739b70..e96fa68ba0c20 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -214,7 +214,7 @@ let checkDependencyList = checkDependencyList' []; checkDependencyList' = positions: name: deps: lib.flip lib.imap1 deps (index: dep: - if lib.isDerivation dep || dep == null || builtins.typeOf dep == "string" || builtins.typeOf dep == "path" then dep + if lib.isDerivation dep || dep == null || builtins.isString dep || builtins.isPath dep then dep else if lib.isList dep then checkDependencyList' ([index] ++ positions) name dep else throw "Dependency is not of a valid type: ${lib.concatMapStrings (ix: "element ${toString ix} of ") ([index] ++ positions)}${name} for ${attrs.name or attrs.pname}"); in if builtins.length erroneousHardeningFlags != 0 |