From 84cd315aa06f03c53b71fcef2456dab3774b5811 Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Fri, 29 Aug 2025 14:09:55 +1000
Subject: nix: fixes

---
 flake.nix       |  2 +-
 nix/default.nix | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 493723a..df68a37 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,7 +53,7 @@
           shellHook = ''
             cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
             cmake --build build
-            export CAELESTIA_LIB_DIR="$PWD/build/assets/cpp";
+            export CAELESTIA_LIB_DIR="$PWD/build/lib";
             export QML2_IMPORT_PATH="$PWD/build/qml";
           '';
         };
diff --git a/nix/default.nix b/nix/default.nix
index 11ea33d..a022a4a 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -68,7 +68,7 @@
     name = "caelestia-assets";
     src = ./../assets/cpp;
 
-    nativeBuildInputs = [cmake pkg-config];
+    nativeBuildInputs = [cmake ninja pkg-config];
     buildInputs = [aubio pipewire];
 
     cmakeFlags = [(lib.cmakeFeature "INSTALL_LIBDIR" "${placeholder "out"}/lib")];
@@ -77,8 +77,10 @@
   plugin = stdenv.mkDerivation {
     name = "caelestia-qml-plugin";
     src = ./../plugin;
-    nativeBuildInputs = [cmake];
+
+    nativeBuildInputs = [cmake ninja];
     buildInputs = [qt6.qtbase qt6.qtdeclarative];
+
     dontWrapQtApps = true;
     cmakeFlags = [(lib.cmakeFeature "INSTALL_QMLDIR" qt6.qtbase.qtQmlPrefix)];
   };
@@ -95,8 +97,8 @@ in
     cmakeBuildType = "Release";
     cmakeFlags = [
       (lib.cmakeFeature "VERSION" version)
-      (lib.cmakeFeature "DONT_BUILD_PLUGIN" "ON")
-      (lib.cmakeFeature "DONT_BUILD_ASSETS" "ON")
+      (lib.cmakeBool "DONT_BUILD_PLUGIN" true)
+      (lib.cmakeBool "DONT_BUILD_ASSETS" true)
       (lib.cmakeFeature "INSTALL_QSCONFDIR" "${placeholder "out"}/share/caelestia-shell")
     ];
 
-- 
cgit v1.2.3-freya