From 88c3624eec1e4daf789cece1bde62f1e6ec46ea5 Mon Sep 17 00:00:00 2001
From: Zach DeCook <zachdecook@librem.one>
Date: Tue, 14 Jan 2025 21:55:09 -0500
Subject: [PATCH] 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*
---
 .github/actions/setup_base/action.yml |  9 ---------
 hyprpm/CMakeLists.txt                 | 16 +---------------
 hyprpm/src/meson.build                |  1 -
 nix/default.nix                       |  4 ----
 4 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/.github/actions/setup_base/action.yml b/.github/actions/setup_base/action.yml
index 6df442b3231..c510bb74fe0 100644
--- a/.github/actions/setup_base/action.yml
+++ b/.github/actions/setup_base/action.yml
@@ -63,15 +63,6 @@ runs:
           librsvg \
           re2
 
-    - name: Get glaze
-      shell: bash
-      run: |
-        git clone https://github.com/stephenberry/glaze.git
-        cd glaze
-        cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
-        cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
-        cmake --install build
-
     - name: Get hyprwayland-scanner-git
       shell: bash
       run: |
diff --git a/hyprpm/CMakeLists.txt b/hyprpm/CMakeLists.txt
index d744ac1635c..22cb8caaa02 100644
--- a/hyprpm/CMakeLists.txt
+++ b/hyprpm/CMakeLists.txt
@@ -11,23 +11,9 @@ set(CMAKE_CXX_STANDARD 23)
 
 pkg_check_modules(hyprpm_deps REQUIRED IMPORTED_TARGET tomlplusplus hyprutils>=0.2.4)
 
-find_package(glaze QUIET)
-if (NOT glaze_FOUND)
-    set(GLAZE_VERSION v4.2.3)
-    message(STATUS "glaze dependency not found, retrieving ${GLAZE_VERSION} with FetchContent")
-    include(FetchContent)
-    FetchContent_Declare(
-        glaze
-        GIT_REPOSITORY https://github.com/stephenberry/glaze.git
-        GIT_TAG ${GLAZE_VERSION}
-        GIT_SHALLOW TRUE
-    )
-    FetchContent_MakeAvailable(glaze)
-endif()
-
 add_executable(hyprpm ${SRCFILES})
 
-target_link_libraries(hyprpm PUBLIC PkgConfig::hyprpm_deps glaze::glaze)
+target_link_libraries(hyprpm PUBLIC PkgConfig::hyprpm_deps)
 
 # binary
 install(TARGETS hyprpm)
diff --git a/hyprpm/src/meson.build b/hyprpm/src/meson.build
index fd914f9d238..2ef6c32389a 100644
--- a/hyprpm/src/meson.build
+++ b/hyprpm/src/meson.build
@@ -8,7 +8,6 @@ executable(
     dependency('hyprutils', version: '>= 0.1.1'),
     dependency('threads'),
     dependency('tomlplusplus'),
-    dependency('glaze', method: 'cmake'),
   ],
   install: true,
 )
diff --git a/nix/default.nix b/nix/default.nix
index 8e3af31d1b0..9293a35c7c3 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -5,14 +5,12 @@
   pkg-config,
   pkgconf,
   makeWrapper,
-  cmake,
   meson,
   ninja,
   aquamarine,
   binutils,
   cairo,
   git,
-  glaze,
   hyprcursor,
   hyprgraphics,
   hyprland-protocols,
@@ -104,7 +102,6 @@ in
         makeWrapper
         meson
         ninja
-        cmake # needed for glaze
         pkg-config
       ];
 
@@ -119,7 +116,6 @@ in
           aquamarine
           cairo
           git
-          glaze
           hyprcursor
           hyprgraphics
           hyprland-protocols