diff --git a/overlays/default.nix b/overlays/default.nix index 9cc26d6..dfeb277 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -48,34 +48,34 @@ 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) + hyprland-git = + lib.mkIf (inputs?hyprland) + (inputs.hyprland.packages.${system}.hyprland.overrideAttrs (final: prev: { + patches = let + glaze_version = inputs.hyprland.inputs.nixpkgs.legacyPackages.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) + 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( - # '' - # ]; - # })); + -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( + '' + ]; + })); prismlauncher = pkgs.prismlauncher.overrideAttrs (final: prev: { buildInputs =