Drop Pango (unused) (#1251)

* Drop unused Pango dependency

* nix: explicitly depend on cairo (previously pulled via pango)

src/meson.build:4:0: ERROR: Dependency "cairo" not found, tried pkgconfig
This commit is contained in:
Jan Beich 2022-12-19 12:13:07 +00:00 committed by GitHub
parent e2ee8b9f20
commit 2f6b37e103
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 8 deletions

View file

@ -54,7 +54,7 @@ message(STATUS "Checking deps...")
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
find_package(PkgConfig 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") file(GLOB_RECURSE SRCFILES "src/*.cpp")

View file

@ -6,6 +6,7 @@
pkg-config, pkg-config,
meson, meson,
ninja, ninja,
cairo,
git, git,
hyprland-protocols, hyprland-protocols,
libdrm, libdrm,
@ -14,7 +15,6 @@
libxkbcommon, libxkbcommon,
mesa, mesa,
mount, mount,
pango,
pciutils, pciutils,
wayland, wayland,
wayland-protocols, wayland-protocols,
@ -62,11 +62,11 @@ in
buildInputs = buildInputs =
[ [
git git
cairo
libdrm libdrm
libinput libinput
libxkbcommon libxkbcommon
mesa mesa
pango
wayland wayland
wayland-protocols wayland-protocols
wayland-scanner wayland-scanner

View file

@ -25,12 +25,10 @@ diff --git a/src/meson.build b/src/meson.build
index 5d64188..a676333 100644 index 5d64188..a676333 100644
--- a/src/meson.build --- a/src/meson.build
+++ b/src/meson.build +++ b/src/meson.build
@@ -7,7 +7,7 @@ executable('Hyprland', src, @@ -7,5 +7,5 @@ executable('Hyprland', src,
server_protos, server_protos,
dependency('wayland-server'), dependency('wayland-server'),
dependency('wayland-client'), dependency('wayland-client'),
- wlroots.get_variable('wlroots'), - wlroots.get_variable('wlroots'),
+ wlroots, + wlroots,
dependency('cairo'), dependency('cairo'),
dependency('pango'),
dependency('pangocairo'),

View file

@ -9,8 +9,6 @@ executable('Hyprland', src,
dependency('wayland-client'), dependency('wayland-client'),
wlroots.get_variable('wlroots'), wlroots.get_variable('wlroots'),
dependency('cairo'), dependency('cairo'),
dependency('pango'),
dependency('pangocairo'),
dependency('libdrm'), dependency('libdrm'),
dependency('egl'), dependency('egl'),
dependency('xkbcommon'), dependency('xkbcommon'),