WARNING: migrate hyprland to unstable
also removing my glaze patch
This commit is contained in:
parent
d9d253fd2a
commit
01d136b291
2 changed files with 28 additions and 32 deletions
|
|
@ -16,9 +16,7 @@
|
|||
nt.url = "git+https://tearforge.net/cry/nt";
|
||||
|
||||
cerulean = {
|
||||
# url = "github:cry128/cerulean/v0.2.5-alpha";
|
||||
url = "github:cry128/cerulean/refactor/snowflake";
|
||||
# url = "/home/me/cry/mk/cerulean";
|
||||
inputs = {
|
||||
nt.follows = "nt";
|
||||
systems.follows = "systems";
|
||||
|
|
@ -42,12 +40,10 @@
|
|||
};
|
||||
|
||||
hyprland = {
|
||||
# FUCK HYPRLAND
|
||||
# url = "github:hyprwm/Hyprland/4152ac76d0813d9d0f67d2f04653a13fa6e17433";
|
||||
url = "git+https://tearforge.net/cry/Hyprland";
|
||||
url = "github:hyprwm/Hyprland";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
nixpkgs.follows = "nixpkgs-unstable";
|
||||
systems.follows = "systems";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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 = 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)
|
||||
# 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 =
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue