From 05f4b7b46d64f2f0b40cf0783a356e2efb47970a Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 17 Mar 2024 19:28:47 +0100 Subject: [PATCH] make-derivation.nix: Fix checkMetaRecursively Oddly, I can't reproduce the error, but this change will make it more robust. See https://github.com/NixOS/nixpkgs/pull/295378#issuecomment-2002094487 --- pkgs/stdenv/generic/make-derivation.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index c40eaee5e4d6..08cded664254 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -556,8 +556,8 @@ let meta = checkMeta.commonMeta { inherit validity attrs pos; - references = attrs.nativeBuildInputs ++ attrs.buildInputs - ++ attrs.propagatedNativeBuildInputs ++ attrs.propagatedBuildInputs; + references = attrs.nativeBuildInputs or [] ++ attrs.buildInputs or [] + ++ attrs.propagatedNativeBuildInputs or [] ++ attrs.propagatedBuildInputs or []; }; validity = checkMeta.assertValidity { inherit meta attrs; };