patch hyprland-git not working on nixpkgs stable
glaze version mismatch
This commit is contained in:
parent
2d67934e29
commit
e0e7c820ea
3 changed files with 54 additions and 3 deletions
|
|
@ -44,5 +44,37 @@
|
|||
awww = inputs.awww.packages.${system}.awww;
|
||||
|
||||
melonloader = import ../packages/melonloader/package.nix super;
|
||||
|
||||
xdg-desktop-portal-hyprland =
|
||||
lib.mkIf (inputs?hyprland)
|
||||
inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland;
|
||||
hyprland-git =
|
||||
lib.mkIf (inputs?hyprland)
|
||||
(inputs.hyprland.packages.${system}.hyprland.overrideAttrs (final: prev: {
|
||||
patches = let
|
||||
glaze_version = pkgs.glaze.version;
|
||||
in
|
||||
prev.patches
|
||||
++ [
|
||||
''
|
||||
diff --git a/hyprpm/CMakeLists.txt b/hyprpm/CMakeLists.txt
|
||||
index 9f1318f4..7d5b8eda 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 7.0.0 QUIET)
|
||||
+find_package(glaze ${glaze_version} QUIET)
|
||||
if (NOT glaze_FOUND)
|
||||
- set(GLAZE_VERSION v7.0.0)
|
||||
+ set(GLAZE_VERSION v${glaze_version})
|
||||
message(STATUS "glaze dependency not found, retrieving ''${GLAZE_VERSION} with FetchContent")
|
||||
include(FetchContent)
|
||||
FetchContent_Declare(
|
||||
''
|
||||
];
|
||||
}));
|
||||
}
|
||||
)
|
||||
|
|
|
|||
16
overlays/patches/glaze.patch
Normal file
16
overlays/patches/glaze.patch
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
diff --git a/hyprpm/CMakeLists.txt b/hyprpm/CMakeLists.txt
|
||||
index 9f1318f4..7d5b8eda 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 7.0.0 QUIET)
|
||||
+find_package(glaze 6.0.1 QUIET)
|
||||
if (NOT glaze_FOUND)
|
||||
- set(GLAZE_VERSION v7.0.0)
|
||||
+ set(GLAZE_VERSION v6.0.1)
|
||||
message(STATUS "glaze dependency not found, retrieving ${GLAZE_VERSION} with FetchContent")
|
||||
include(FetchContent)
|
||||
FetchContent_Declare(
|
||||
Loading…
Add table
Add a link
Reference in a new issue