Skip to content

Commit 88c3624

Browse files
committed
Remove dependency on glaze
Using an advanced JSON library for string parsing was overkill, and limited compatibility as glaze compiles on fewer systems than all of hypr*
1 parent 9e15bbb commit 88c3624

File tree

4 files changed

+1
-29
lines changed

4 files changed

+1
-29
lines changed

.github/actions/setup_base/action.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,6 @@ runs:
6363
librsvg \
6464
re2
6565
66-
- name: Get glaze
67-
shell: bash
68-
run: |
69-
git clone https://github.com/stephenberry/glaze.git
70-
cd glaze
71-
cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
72-
cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
73-
cmake --install build
74-
7566
- name: Get hyprwayland-scanner-git
7667
shell: bash
7768
run: |

hyprpm/CMakeLists.txt

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,9 @@ set(CMAKE_CXX_STANDARD 23)
1111

1212
pkg_check_modules(hyprpm_deps REQUIRED IMPORTED_TARGET tomlplusplus hyprutils>=0.2.4)
1313

14-
find_package(glaze QUIET)
15-
if (NOT glaze_FOUND)
16-
set(GLAZE_VERSION v4.2.3)
17-
message(STATUS "glaze dependency not found, retrieving ${GLAZE_VERSION} with FetchContent")
18-
include(FetchContent)
19-
FetchContent_Declare(
20-
glaze
21-
GIT_REPOSITORY https://github.com/stephenberry/glaze.git
22-
GIT_TAG ${GLAZE_VERSION}
23-
GIT_SHALLOW TRUE
24-
)
25-
FetchContent_MakeAvailable(glaze)
26-
endif()
27-
2814
add_executable(hyprpm ${SRCFILES})
2915

30-
target_link_libraries(hyprpm PUBLIC PkgConfig::hyprpm_deps glaze::glaze)
16+
target_link_libraries(hyprpm PUBLIC PkgConfig::hyprpm_deps)
3117

3218
# binary
3319
install(TARGETS hyprpm)

hyprpm/src/meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ executable(
88
dependency('hyprutils', version: '>= 0.1.1'),
99
dependency('threads'),
1010
dependency('tomlplusplus'),
11-
dependency('glaze', method: 'cmake'),
1211
],
1312
install: true,
1413
)

nix/default.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
pkg-config,
66
pkgconf,
77
makeWrapper,
8-
cmake,
98
meson,
109
ninja,
1110
aquamarine,
1211
binutils,
1312
cairo,
1413
git,
15-
glaze,
1614
hyprcursor,
1715
hyprgraphics,
1816
hyprland-protocols,
@@ -104,7 +102,6 @@ in
104102
makeWrapper
105103
meson
106104
ninja
107-
cmake # needed for glaze
108105
pkg-config
109106
];
110107

@@ -119,7 +116,6 @@ in
119116
aquamarine
120117
cairo
121118
git
122-
glaze
123119
hyprcursor
124120
hyprgraphics
125121
hyprland-protocols

0 commit comments

Comments
 (0)