From ba5b1cd1cc0d85585806cb8d1f94c95da712909f Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 6 Jul 2025 21:02:32 +0300 Subject: [PATCH] packaging: use structuredAttrs staging-next banned !structuredAttrs && separateDebugInfo && disallowedRequisites due to weird output interactions. Enable structuredAttrs so we can build again. Also, fix type confusion that makes stdenv explode (https://github.com/NixOS/nixpkgs/issues/422989). Co-authored-by: eldritch horrors Change-Id: Ic0c773394ee79e10d427f27750d59892d6d1f1d1 (cherry picked from commit 378b360bf8e0d04e8dd3733acd20d7a9b70360f1) --- package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package.nix b/package.nix index fa9d71940..920f1bf8d 100644 --- a/package.nix +++ b/package.nix @@ -135,10 +135,10 @@ let # This could be the dtrace for macOS, etc, but I have no idea if it is # packaged or if it works. - dtrace-generator = lib.optional withDtrace systemtap-lix; + dtrace-generator = if withDtrace then systemtap-lix else null; # This is for sys/sdt.h - dtrace-headers = lib.optional withDtrace libsystemtap; + dtrace-headers = if withDtrace then libsystemtap else null; aws-sdk-cpp-nix = if aws-sdk-cpp == null then @@ -209,6 +209,8 @@ assert (lintInsteadOfBuild -> lix-clang-tidy != null); stdenv.mkDerivation (finalAttrs: { inherit pname version; + __structuredAttrs = true; + src = fileset.toSource { root = ./.; fileset = fileset.intersection baseFiles (