From 0288773ccb03d72c21c1cd117eeecac2c5cb76c1 Mon Sep 17 00:00:00 2001 From: Daniel Dada Date: Thu, 18 Dec 2025 23:33:04 +0300 Subject: [PATCH] revert removed deps --- cmake/Dependencies.cmake | 5 ++++- flake.lock | 6 +++--- package.nix | 2 ++ src/core/common/version.hpp | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index 9b61288..f8aa1db 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -19,6 +19,8 @@ elseif(APPLE) option(USE_SYSTEM_GLFW ON) find_package(Freetype REQUIRED) find_package(ZLIB REQUIRED) + find_package(BZip2 REQUIRED) + find_package(PNG REQUIRED) find_package(PkgConfig QUIET) if(PkgConfig_FOUND) @@ -29,7 +31,8 @@ else() find_package(PkgConfig REQUIRED) find_package(Fontconfig REQUIRED) find_package(ZLIB REQUIRED) - + find_package(BZip2 REQUIRED) + find_package(PNG REQUIRED) pkg_check_modules(HARFBUZZ harfbuzz) pkg_check_modules(WAYLAND_CLIENT wayland-client) pkg_check_modules(WAYLAND_EGL wayland-egl) diff --git a/flake.lock b/flake.lock index 65e4798..7009e57 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { diff --git a/package.nix b/package.nix index c389c0d..869e3de 100644 --- a/package.nix +++ b/package.nix @@ -15,6 +15,7 @@ wayland, libxkbcommon, zlib, + bzip2, wayland-scanner, gtk3, glib, @@ -70,6 +71,7 @@ stdenv.mkDerivation rec { wayland-protocols libxkbcommon zlib + bzip2 gtk3 gsettings-desktop-schemas glib diff --git a/src/core/common/version.hpp b/src/core/common/version.hpp index 1eee952..6079a1d 100644 --- a/src/core/common/version.hpp +++ b/src/core/common/version.hpp @@ -6,7 +6,7 @@ namespace clrsync::core { -const std::string GIT_SEMVER = "0.1.6+git.g292a748"; +const std::string GIT_SEMVER = "0.1.6+git.gc68ca3d"; const std::string version_string(); } // namespace clrsync::core