From e58e97b0a38b8ccc87a4304c9e4e2b37c9966875 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Thu, 7 Nov 2024 10:52:12 +0200 Subject: [PATCH] Nix: build aquamarine and hyprutils in debug when using hyprland-debug --- nix/default.nix | 4 +--- nix/overlays.nix | 8 +++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index d463e271..29d31485 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -56,6 +56,7 @@ adapters = flatten [ stdenvAdapters.useMoldLinker + (lib.optional debug stdenvAdapters.keepDebugInfo) ]; customStdenv = foldl' (acc: adapter: adapter acc) stdenv adapters; @@ -147,9 +148,6 @@ in then "debugoptimized" else "release"; - # we want as much debug info as possible - dontStrip = debug; - mesonFlags = flatten [ (mapAttrsToList mesonEnable { "xwayland" = enableXWayland; diff --git a/nix/overlays.nix b/nix/overlays.nix index b1eb66ad..a7106315 100644 --- a/nix/overlays.nix +++ b/nix/overlays.nix @@ -40,7 +40,13 @@ in { inherit date; }; hyprland-unwrapped = final.hyprland.override {wrapRuntimeDeps = false;}; - hyprland-debug = final.hyprland.override {debug = true;}; + + # Build major libs with debug to get as much info as possible in a stacktrace + hyprland-debug = final.hyprland.override { + aquamarine = final.aquamarine.override {debug = true;}; + hyprutils = final.hyprutils.override {debug = true;}; + debug = true; + }; hyprland-legacy-renderer = final.hyprland.override {legacyRenderer = true;}; # deprecated packages