Add CMake, Ninja

This commit is contained in:
Olli Vuolteenaho 2024-01-17 09:33:36 +02:00
parent 9826423b29
commit 42575b2f74
1 changed files with 2 additions and 4 deletions

View File

@ -19,6 +19,7 @@
systemPackages = [ systemPackages = [
pkgs.android-tools pkgs.android-tools
pkgs.bat pkgs.bat
pkgs.cmake
pkgs.coreutils pkgs.coreutils
pkgs.curl pkgs.curl
pkgs.direnv pkgs.direnv
@ -26,6 +27,7 @@
pkgs.git-lfs pkgs.git-lfs
pkgs.lsd pkgs.lsd
pkgs.neovim pkgs.neovim
pkgs.ninja
pkgs.openfortivpn pkgs.openfortivpn
pkgs.openjdk17 pkgs.openjdk17
pkgs.python3 pkgs.python3
@ -39,8 +41,6 @@
JAVA_HOME = "${pkgs.openjdk17.home}"; JAVA_HOME = "${pkgs.openjdk17.home}";
ANDROID_SDK_ROOT = "/Users/ollivuolteenaho/Library/Android/sdk"; ANDROID_SDK_ROOT = "/Users/ollivuolteenaho/Library/Android/sdk";
ANDROID_NDK_ROOT = "/Users/ollivuolteenaho/Library/Android/sdk/ndk/25.1.8937393"; 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}"; JAVA_HOME = "${pkgs.openjdk17.home}";
ANDROID_SDK_ROOT = "/Users/ollivuolteenaho/Library/Android/sdk"; ANDROID_SDK_ROOT = "/Users/ollivuolteenaho/Library/Android/sdk";
ANDROID_NDK_ROOT = "/Users/ollivuolteenaho/Library/Android/sdk/ndk/25.1.8937393"; 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 = { programs.fish = {