From 05c1f927c632bf443a03dc6313e8f2915cc91078 Mon Sep 17 00:00:00 2001 From: Daniil Iaitskov Date: Tue, 23 Apr 2024 12:19:42 -0400 Subject: [PATCH] stdenv: checkDependencyList' now tolerates null deps --- pkgs/stdenv/generic/make-derivation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 6f0aa50e9083..2e0322970289 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -318,7 +318,7 @@ let checkDependencyList' = positions: name: deps: imap1 (index: dep: - if isDerivation dep || dep == null || builtins.isString dep || builtins.isPath dep then dep + if dep == null || isDerivation dep || builtins.isString dep || builtins.isPath dep then dep else if isList dep then checkDependencyList' ([index] ++ positions) name dep 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;