From 657cee2b98f7b085a384aba41d24bfd4177999f8 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Wed, 6 Dec 2023 23:55:04 +0200 Subject: [PATCH] Nix & Meson: add hyprpm --- hyprpm/src/meson.build | 10 ++++++++++ meson.build | 1 + nix/default.nix | 8 +++++--- 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 hyprpm/src/meson.build diff --git a/hyprpm/src/meson.build b/hyprpm/src/meson.build new file mode 100644 index 00000000..0adae7aa --- /dev/null +++ b/hyprpm/src/meson.build @@ -0,0 +1,10 @@ +globber = run_command('sh', '-c', 'find . -name "*.cpp" | sort', check: true) +src = globber.stdout().strip().split('\n') + +executable('hyprpm', src, + dependencies: [ + dependency('threads'), + dependency('tomlplusplus') + ], + install : true +) diff --git a/meson.build b/meson.build index de29528e..81d6e403 100644 --- a/meson.build +++ b/meson.build @@ -80,6 +80,7 @@ endforeach subdir('protocols') subdir('src') subdir('hyprctl') +subdir('hyprpm/src') subdir('assets') subdir('example') subdir('docs') diff --git a/nix/default.nix b/nix/default.nix index 7ddeae94..68b1bb22 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -20,6 +20,7 @@ pango, pciutils, systemd, + tomlplusplus, udis86, wayland, wayland-protocols, @@ -81,19 +82,20 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov buildInputs = [ - git cairo + git hyprland-protocols - libGL libdrm_2_4_118 + libGL libinput libxkbcommon mesa pango + pciutils + tomlplusplus udis86 wayland wayland-protocols - pciutils wlroots ] ++ lib.optionals enableXWayland [libxcb xcbutilwm xwayland]