From 42575b2f747d87aa51dad9b8e391cabf8e3d73d3 Mon Sep 17 00:00:00 2001
From: Olli Vuolteenaho <olli.vuolteenaho@qt.io>
Date: Wed, 17 Jan 2024 09:33:36 +0200
Subject: [PATCH] Add CMake, Ninja

---
 flake.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index 1f3cb01..635cca3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,6 +19,7 @@
         systemPackages = [ 
           pkgs.android-tools
           pkgs.bat
+          pkgs.cmake
           pkgs.coreutils
           pkgs.curl
           pkgs.direnv
@@ -26,6 +27,7 @@
           pkgs.git-lfs
           pkgs.lsd
           pkgs.neovim
+          pkgs.ninja
           pkgs.openfortivpn
           pkgs.openjdk17
           pkgs.python3
@@ -39,8 +41,6 @@
           JAVA_HOME = "${pkgs.openjdk17.home}";
           ANDROID_SDK_ROOT = "/Users/ollivuolteenaho/Library/Android/sdk";
           ANDROID_NDK_ROOT = "/Users/ollivuolteenaho/Library/Android/sdk/ndk/25.1.8937393";
-          CMAKE_ROOT = "/Users/ollivuolteenaho/Qt/Tools/CMake/Cmake.app/Contents/bin";
-          NINJA_ROOT = "/Users/ollivuolteenaho/Qt/Tools/Ninja";
         };
       };
 
@@ -66,8 +66,6 @@
         JAVA_HOME = "${pkgs.openjdk17.home}";
         ANDROID_SDK_ROOT = "/Users/ollivuolteenaho/Library/Android/sdk";
         ANDROID_NDK_ROOT = "/Users/ollivuolteenaho/Library/Android/sdk/ndk/25.1.8937393";
-        CMAKE_ROOT = "/Users/ollivuolteenaho/Qt/Tools/CMake/Cmake.app/Contents/bin";
-        NINJA_ROOT = "/Users/ollivuolteenaho/Qt/Tools/Ninja";
       };
 
       programs.fish = {