From 50d32f3c96945d35840888a126de48c7739872cc Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Fri, 13 Sep 2024 05:42:20 +0200 Subject: [PATCH] flake: clean up dependencies a bit * qt6.* instead of kdePackages.* * use an extra-cmake-modules that depends on Qt6 rather than 5, and exclude it on macOS --- flake.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index d670ea76..8236ccd3 100644 --- a/flake.nix +++ b/flake.nix @@ -25,23 +25,23 @@ cmake ninja pkg-config - kdePackages.wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = (with pkgs; [ - kdePackages.qtbase - kdePackages.qtmultimedia - extra-cmake-modules + qt6.qtbase + qt6.qtmultimedia SDL2 zstd libarchive libGL libslirp enet - ]) ++ optionals isLinux [ - pkgs.wayland - pkgs.kdePackages.qtwayland - ]; + ]) ++ optionals (!isDarwin) (with pkgs; [ + kdePackages.extra-cmake-modules + qt6.qtwayland + wayland + ]); cmakeFlags = [ (cmakeBool "USE_QT6" true)