diff --git a/nix/default.nix b/nix/default.nix index b458247e..b09f67f6 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -105,6 +105,13 @@ in ])); }; + patches = [ + # Bump hyprpm's glaze dependency to 7.0.0, the version already present + # in Nixpkgs. + # TODO: apply patch globally when Arch repos get glaze 7.0.0. + ./glaze.patch + ]; + postPatch = '' # Fix hardcoded paths to /usr installation sed -i "s#/usr#$out#" src/render/OpenGL.cpp diff --git a/nix/glaze.patch b/nix/glaze.patch new file mode 100644 index 00000000..7b793dd5 --- /dev/null +++ b/nix/glaze.patch @@ -0,0 +1,16 @@ +diff --git a/hyprpm/CMakeLists.txt b/hyprpm/CMakeLists.txt +index ee738104..377872dc 100644 +--- a/hyprpm/CMakeLists.txt ++++ b/hyprpm/CMakeLists.txt +@@ -11,9 +11,9 @@ set(CMAKE_CXX_STANDARD 23) + + pkg_check_modules(hyprpm_deps REQUIRED IMPORTED_TARGET tomlplusplus hyprutils>=0.7.0) + +-find_package(glaze 6.0.0 QUIET) ++find_package(glaze 7.0.0 QUIET) + if (NOT glaze_FOUND) +- set(GLAZE_VERSION v6.1.0) ++ set(GLAZE_VERSION v7.0.0) + message(STATUS "glaze dependency not found, retrieving ${GLAZE_VERSION} with FetchContent") + include(FetchContent) + FetchContent_Declare(