From 1466adc629b00aa1484d146b4416c50c8b281570 Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Wed, 24 Sep 2025 12:27:28 +1000 Subject: nix: consistent build type --- nix/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index c87d616..bd246a6 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -56,6 +56,11 @@ fontDirectories = [material-symbols rubik nerd-fonts.caskaydia-cove]; }; + cmakeBuildType = + if debug + then "Debug" + else "RelWithDebInfo"; + cmakeVersionFlags = [ (lib.cmakeFeature "VERSION" version) (lib.cmakeFeature "GIT_REVISION" rev) @@ -63,6 +68,7 @@ ]; extras = stdenv.mkDerivation { + inherit cmakeBuildType; name = "caelestia-extras${lib.optionalString debug "-debug"}"; src = lib.fileset.toSource { root = ./..; @@ -80,6 +86,7 @@ }; plugin = stdenv.mkDerivation { + inherit cmakeBuildType; name = "caelestia-qml-plugin${lib.optionalString debug "-debug"}"; src = lib.fileset.toSource { root = ./..; @@ -99,7 +106,7 @@ }; in stdenv.mkDerivation { - inherit version; + inherit version cmakeBuildType; pname = "caelestia-shell${lib.optionalString debug "-debug"}"; src = ./..; @@ -107,10 +114,6 @@ in buildInputs = [quickshell extras plugin xkeyboard-config qt6.qtbase]; propagatedBuildInputs = runtimeDeps; - cmakeBuildType = - if debug - then "Debug" - else "RelWithDebInfo"; cmakeFlags = [ (lib.cmakeFeature "ENABLE_MODULES" "shell") -- cgit v1.2.3-freya