Revert "nix: adapt cmake options"

This reverts commit c35ed8363f.
This commit is contained in:
Mihai Fufezan 2024-09-22 12:35:29 +03:00
parent cb7f9140da
commit 674e7df000
Signed by: fufexan
SSH key fingerprint: SHA256:SdnKmEpJrDu1+2UO1QpB/Eg4HKcdDi6n+xSRqFNJVpg
3 changed files with 40 additions and 12 deletions

10
nix/cmake-version.patch Normal file
View file

@ -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)

View file

@ -53,7 +53,7 @@
inherit (lib.attrsets) mapAttrsToList; inherit (lib.attrsets) mapAttrsToList;
inherit (lib.lists) flatten concatLists optional optionals; inherit (lib.lists) flatten concatLists optional optionals;
inherit (lib.sources) cleanSourceWith cleanSource; inherit (lib.sources) cleanSourceWith cleanSource;
inherit (lib.strings) hasSuffix makeBinPath optionalString mesonBool mesonEnable; inherit (lib.strings) cmakeBool hasSuffix makeBinPath optionalString;
adapters = flatten [ adapters = flatten [
stdenvAdapters.useMoldLinker stdenvAdapters.useMoldLinker
@ -76,6 +76,14 @@ in
src = cleanSource ../.; src = cleanSource ../.;
}; };
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 = '' postPatch = ''
# Fix hardcoded paths to /usr installation # Fix hardcoded paths to /usr installation
sed -i "s#/usr#$out#" src/render/OpenGL.cpp sed -i "s#/usr#$out#" src/render/OpenGL.cpp
@ -144,22 +152,20 @@ in
(optional withSystemd systemd) (optional withSystemd systemd)
]; ];
mesonBuildType = cmakeBuildType =
if debug if debug
then "debug" then "Debug"
else "release"; else "RelWithDebInfo";
# we want as much debug info as possible # we want as much debug info as possible
dontStrip = debug; dontStrip = debug;
mesonFlags = flatten [ cmakeFlags = mapAttrsToList cmakeBool {
(mapAttrsToList mesonEnable { "NO_XWAYLAND" = !enableXWayland;
"xwayland" = enableXWayland; "LEGACY_RENDERER" = legacyRenderer;
"legacy_renderer" = legacyRenderer; "NO_SYSTEMD" = !withSystemd;
"systemd" = withSystemd; "CMAKE_DISABLE_PRECOMPILE_HEADERS" = true;
}) };
(mesonBool "b_pch" false)
];
postInstall = '' postInstall = ''
${optionalString wrapRuntimeDeps '' ${optionalString wrapRuntimeDeps ''

12
nix/stdcxx.patch Normal file
View file

@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfbd431f..73e8e0c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,7 @@ endif()
include_directories(. "src/" "subprojects/udis86/" "protocols/")
set(CMAKE_CXX_STANDARD 26)
add_compile_options(
+ -std=c++26
-Wall
-Wextra
-Wno-unused-parameter