Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/CMakeLists.txt b/CMakeLists.txt
- index d8424d9..9fabba1 100644
- --- a/CMakeLists.txt
- +++ b/CMakeLists.txt
- @@ -64,7 +64,7 @@ else()
- endif()
- include_directories(. "src/" "subprojects/udis86/" "protocols/")
- -set(CMAKE_CXX_STANDARD 26)
- +set(CMAKE_CXX_STANDARD 23)
- add_compile_options(
- -Wall
- -Wextra
- diff --git a/flake.nix b/flake.nix
- index 9e1e3ab..9c20b3f 100644
- --- a/flake.nix
- +++ b/flake.nix
- @@ -95,7 +95,7 @@
- devShells = eachSystem (system: {
- default =
- pkgsFor.${system}.mkShell.override {
- - stdenv = pkgsFor.${system}.gcc14Stdenv;
- + stdenv = pkgsFor.${system}.gcc13Stdenv;
- } {
- name = "hyprland-shell";
- nativeBuildInputs = with pkgsFor.${system}; [
- diff --git a/meson.build b/meson.build
- index 9a30f31..075139f 100644
- --- a/meson.build
- +++ b/meson.build
- @@ -6,7 +6,7 @@ project('Hyprland', 'cpp', 'c',
- 'optimization=3',
- 'buildtype=release',
- 'debug=false',
- - 'cpp_std=c++26',
- + 'cpp_std=c++23',
- ])
- datarootdir = '-DDATAROOTDIR="' + get_option('prefix') / get_option('datadir') + '"'
- diff --git a/nix/default.nix b/nix/default.nix
- index 1c6a011..d7f1087 100644
- --- a/nix/default.nix
- +++ b/nix/default.nix
- @@ -61,11 +61,6 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov
- src = lib.cleanSource ../.;
- };
- - patches = [
- - # forces GCC to use -std=c++26
- - ./stdcxx.patch
- - ];
- -
- postPatch = ''
- # Fix hardcoded paths to /usr installation
- sed -i "s#/usr#$out#" src/render/OpenGL.cpp
- diff --git a/nix/overlays.nix b/nix/overlays.nix
- index d6e078f..d231518 100644
- --- a/nix/overlays.nix
- +++ b/nix/overlays.nix
- @@ -31,7 +31,7 @@ in {
- date = mkDate (self.lastModifiedDate or "19700101");
- in {
- hyprland = final.callPackage ./default.nix {
- - stdenv = final.gcc14Stdenv;
- + stdenv = final.gcc13Stdenv;
- version = "${version}+date=${date}_${self.shortRev or "dirty"}";
- commit = self.rev or "";
- revCount = self.sourceInfo.revCount or "";
- diff --git a/nix/stdcxx.patch b/nix/stdcxx.patch
- deleted file mode 100644
- index 032e494..0000000
- --- a/nix/stdcxx.patch
- +++ /dev/null
- @@ -1,12 +0,0 @@
- -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
- diff --git a/src/debug/Log.cpp b/src/debug/Log.cpp
- index a4c5b08..0def77c 100644
- --- a/src/debug/Log.cpp
- +++ b/src/debug/Log.cpp
- @@ -5,13 +5,10 @@
- #include <fstream>
- #include <iostream>
- -#include <fcntl.h>
- void Debug::init(const std::string& IS) {
- logFile = IS + (ISDEBUG ? "/hyprlandd.log" : "/hyprland.log");
- logOfs.open(logFile, std::ios::out | std::ios::app);
- - auto handle = logOfs.native_handle();
- - fcntl(handle, F_SETFD, FD_CLOEXEC);
- }
- void Debug::close() {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement