diff --git a/package.nix b/package.nix
index fb3d15f81..254839c3c 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
@@ -201,6 +201,8 @@ assert (lintInsteadOfBuild -> lix-clang-tidy != null);
 stdenv.mkDerivation (finalAttrs: {
   inherit pname version;
 
+  __structuredAttrs = true;
+
   # python3.withPackages does not splice properly, see https://github.com/NixOS/nixpkgs/issues/305858
   lixPythonForBuild = python3.pythonOnBuildForHost.withPackages (
     p: