From a07d262b8889a217f3d502242b619a290a6ce33f Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Sun, 26 Apr 2026 11:27:20 -0400 Subject: [PATCH] stdenv.mkDerivation: inline variable --- pkgs/stdenv/generic/make-derivation.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 7015353fee33..d05e003bb6eb 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -394,13 +394,17 @@ let separateDebugInfo' = let actualValue = separateDebugInfo && isLinux; - conflictingOption = + in + if + actualValue + && ( attrs ? "disallowedReferences" || attrs ? "disallowedRequisites" || attrs ? "allowedRequisites" - || attrs ? "allowedReferences"; - in - if actualValue && conflictingOption && !__structuredAttrs then + || attrs ? "allowedReferences" + ) + && !__structuredAttrs + then throw "separateDebugInfo = true in ${ attrs.pname or "mkDerivation argument" } requires __structuredAttrs if {dis,}allowedRequisites or {dis,}allowedReferences is set"