Skip to content

Commit

Permalink
flake: clean up dependencies a bit
Browse files Browse the repository at this point in the history
* qt6.* instead of kdePackages.*
* use an extra-cmake-modules that depends on Qt6 rather than 5, and
  exclude it on macOS
  • Loading branch information
nadiaholmquist committed Sep 13, 2024
1 parent 74f479c commit 50d32f3
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 50d32f3

Please sign in to comment.