diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-18 00:02:20 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-18 00:02:20 +0000 |
commit | ac91cf83c1145b230e88cdff8df1cb802a04948c (patch) | |
tree | 8baebd407714408b2407a21a5204c462876f1beb /pkgs/stdenv | |
parent | fb37c3e5f920ccc885a0b528830daa96f097c2d7 (diff) | |
parent | 44c455bfb6dd2dc312d3fe4feb02f357c05f3f8a (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index c40eaee5e4d6b..08cded6642547 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; }; |