diff options
| author | davc0n <[email protected]> | 2024-09-10 12:06:37 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-09-10 11:06:37 +0100 |
| commit | c67b257e51133a2aaeec050fc4d283e2eaea6375 (patch) | |
| tree | 987e50002de7b85bd67afd095618e1c1ef19164b | |
| parent | 8237d7e1a4994f70636b2e91584775308f24a584 (diff) | |
| download | Hyprland-c67b257e51133a2aaeec050fc4d283e2eaea6375.tar.gz Hyprland-c67b257e51133a2aaeec050fc4d283e2eaea6375.zip | |
build: Set cmake_minimum_required to version 3.30 (#7709)
* build: Set cmake_minimum_required to version 3.30
* Nix: add patch for CMake min ver
---------
Co-authored-by: Mihai Fufezan <[email protected]>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | nix/cmake-version.patch | 10 | ||||
| -rw-r--r-- | nix/default.nix | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d8424d91..6fdf98db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.27) +cmake_minimum_required(VERSION 3.30) # Get version file(READ "${CMAKE_SOURCE_DIR}/VERSION" VER_RAW) diff --git a/nix/cmake-version.patch b/nix/cmake-version.patch new file mode 100644 index 00000000..ccc9c738 --- /dev/null +++ b/nix/cmake-version.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6fdf98db..d8424d91 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.30) ++cmake_minimum_required(VERSION 3.27) + + # Get version + file(READ "${CMAKE_SOURCE_DIR}/VERSION" VER_RAW) diff --git a/nix/default.nix b/nix/default.nix index 1c6a0113..985a4cbb 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -64,6 +64,8 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov patches = [ # forces GCC to use -std=c++26 ./stdcxx.patch + # Nix does not have CMake 3.30 yet, so override the minimum version + ./cmake-version.patch ]; postPatch = '' |