WARNING: migrate hyprland to unstable

also removing my glaze patch
This commit is contained in:
do butterflies cry? 2026-03-22 12:32:14 +10:00
parent d9d253fd2a
commit 01d136b291
Signed by: cry
GPG key ID: F68745A836CA0412
2 changed files with 28 additions and 32 deletions

View file

@ -16,9 +16,7 @@
nt.url = "git+https://tearforge.net/cry/nt"; nt.url = "git+https://tearforge.net/cry/nt";
cerulean = { cerulean = {
# url = "github:cry128/cerulean/v0.2.5-alpha";
url = "github:cry128/cerulean/refactor/snowflake"; url = "github:cry128/cerulean/refactor/snowflake";
# url = "/home/me/cry/mk/cerulean";
inputs = { inputs = {
nt.follows = "nt"; nt.follows = "nt";
systems.follows = "systems"; systems.follows = "systems";
@ -42,12 +40,10 @@
}; };
hyprland = { hyprland = {
# FUCK HYPRLAND url = "github:hyprwm/Hyprland";
# url = "github:hyprwm/Hyprland/4152ac76d0813d9d0f67d2f04653a13fa6e17433";
url = "git+https://tearforge.net/cry/Hyprland";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs-unstable";
systems.follows = "systems"; systems.follows = "systems";
}; };
}; };

View file

@ -48,34 +48,34 @@
xdg-desktop-portal-hyprland = xdg-desktop-portal-hyprland =
lib.mkIf (inputs?hyprland) lib.mkIf (inputs?hyprland)
inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland; inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland;
hyprland-git = # hyprland-git =
lib.mkIf (inputs?hyprland) # lib.mkIf (inputs?hyprland)
(inputs.hyprland.packages.${system}.hyprland.overrideAttrs (final: prev: { # (inputs.hyprland.packages.${system}.hyprland.overrideAttrs (final: prev: {
patches = let # patches = let
glaze_version = pkgs.glaze.version; # glaze_version = pkgs.glaze.version;
in # in
prev.patches # prev.patches
++ [ # ++ [
'' # ''
diff --git a/hyprpm/CMakeLists.txt b/hyprpm/CMakeLists.txt # diff --git a/hyprpm/CMakeLists.txt b/hyprpm/CMakeLists.txt
index 9f1318f4..7d5b8eda 100644 # index 9f1318f4..7d5b8eda 100644
--- a/hyprpm/CMakeLists.txt # --- a/hyprpm/CMakeLists.txt
+++ b/hyprpm/CMakeLists.txt # +++ b/hyprpm/CMakeLists.txt
@@ -11,9 +11,9 @@ set(CMAKE_CXX_STANDARD 23) # @@ -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 7.0.0 QUIET)
+find_package(glaze ${glaze_version} QUIET) # +find_package(glaze ${glaze_version} QUIET)
if (NOT glaze_FOUND) # if (NOT glaze_FOUND)
- set(GLAZE_VERSION v7.0.0) # - set(GLAZE_VERSION v7.0.0)
+ set(GLAZE_VERSION v${glaze_version}) # + set(GLAZE_VERSION v${glaze_version})
message(STATUS "glaze dependency not found, retrieving ''${GLAZE_VERSION} with FetchContent") # message(STATUS "glaze dependency not found, retrieving ''${GLAZE_VERSION} with FetchContent")
include(FetchContent) # include(FetchContent)
FetchContent_Declare( # FetchContent_Declare(
'' # ''
]; # ];
})); # }));
prismlauncher = pkgs.prismlauncher.overrideAttrs (final: prev: { prismlauncher = pkgs.prismlauncher.overrideAttrs (final: prev: {
buildInputs = buildInputs =