diff --git a/CMakeLists.txt b/CMakeLists.txt index a0eb2f10..de35c507 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ message(STATUS "Checking deps...") find_package(Threads REQUIRED) find_package(PkgConfig REQUIRED) -pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-server wayland-client wayland-cursor wayland-protocols cairo pango pangocairo libdrm egl xkbcommon libinput) # we do not check for wlroots, as we provide it ourselves +pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-server wayland-client wayland-cursor wayland-protocols cairo libdrm egl xkbcommon libinput) # we do not check for wlroots, as we provide it ourselves file(GLOB_RECURSE SRCFILES "src/*.cpp") diff --git a/nix/default.nix b/nix/default.nix index 58d63712..042fbfe7 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -6,6 +6,7 @@ pkg-config, meson, ninja, + cairo, git, hyprland-protocols, libdrm, @@ -14,7 +15,6 @@ libxkbcommon, mesa, mount, - pango, pciutils, wayland, wayland-protocols, @@ -62,11 +62,11 @@ in buildInputs = [ git + cairo libdrm libinput libxkbcommon mesa - pango wayland wayland-protocols wayland-scanner diff --git a/nix/meson-build.patch b/nix/meson-build.patch index 57950de9..53f11969 100644 --- a/nix/meson-build.patch +++ b/nix/meson-build.patch @@ -25,12 +25,10 @@ diff --git a/src/meson.build b/src/meson.build index 5d64188..a676333 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -7,7 +7,7 @@ executable('Hyprland', src, +@@ -7,5 +7,5 @@ executable('Hyprland', src, server_protos, dependency('wayland-server'), dependency('wayland-client'), - wlroots.get_variable('wlroots'), + wlroots, dependency('cairo'), - dependency('pango'), - dependency('pangocairo'), diff --git a/src/meson.build b/src/meson.build index 5084ef98..a8fa7cfc 100644 --- a/src/meson.build +++ b/src/meson.build @@ -9,8 +9,6 @@ executable('Hyprland', src, dependency('wayland-client'), wlroots.get_variable('wlroots'), dependency('cairo'), - dependency('pango'), - dependency('pangocairo'), dependency('libdrm'), dependency('egl'), dependency('xkbcommon'),