Skip to content

Commit

Permalink
nix: adapt cmake options
Browse files Browse the repository at this point in the history
  • Loading branch information
diniamo authored and fufexan committed Sep 13, 2024
1 parent d505b33 commit c35ed83
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 36 deletions.
10 changes: 0 additions & 10 deletions nix/cmake-version.patch

This file was deleted.

21 changes: 7 additions & 14 deletions nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,6 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov
src = lib.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 = ''
# Fix hardcoded paths to /usr installation
sed -i "s#/usr#$out#" src/render/OpenGL.cpp
Expand Down Expand Up @@ -144,18 +137,18 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov
(lib.optionals withSystemd [systemd])
];

cmakeBuildType =
mesonBuildType =
if debug
then "Debug"
else "RelWithDebInfo";
then "debug"
else "release";

# we want as much debug info as possible
dontStrip = debug;

cmakeFlags = [
(lib.cmakeBool "NO_XWAYLAND" (!enableXWayland))
(lib.cmakeBool "LEGACY_RENDERER" legacyRenderer)
(lib.cmakeBool "NO_SYSTEMD" (!withSystemd))
mesonFlags = [
(lib.mesonEnable "xwayland" enableXWayland)
(lib.mesonEnable "legacy_renderer" legacyRenderer)
(lib.mesonEnable "systemd" withSystemd)
];

postInstall = ''
Expand Down
12 changes: 0 additions & 12 deletions nix/stdcxx.patch

This file was deleted.

0 comments on commit c35ed83

Please sign in to comment.