wl-gammactl: don't need wlroots
This commit is contained in:
parent
bbb4adee2f
commit
e92eba7c8d
3 changed files with 25 additions and 5 deletions
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, meson, pkg-config, ninja
|
||||
, wayland, wayland-scanner, wlroots, wlr-protocols, gtk3, glib
|
||||
, wayland, wayland-scanner, wlr-protocols, gtk3, glib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -16,13 +16,15 @@ stdenv.mkDerivation rec {
|
|||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ meson pkg-config ninja glib wayland-scanner ];
|
||||
buildInputs = [ wayland wlroots gtk3 ];
|
||||
buildInputs = [ wayland gtk3 ];
|
||||
|
||||
postUnpack = ''
|
||||
rmdir source/wlr-protocols
|
||||
ln -s ${wlr-protocols}/share/wlr-protocols source
|
||||
'';
|
||||
|
||||
patches = [ ./dont-need-wlroots.diff ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace meson.build --replace "git = find_program('git')" "git = 'false'"
|
||||
'';
|
||||
|
|
20
pkgs/tools/wayland/wl-gammactl/dont-need-wlroots.diff
Normal file
20
pkgs/tools/wayland/wl-gammactl/dont-need-wlroots.diff
Normal file
|
@ -0,0 +1,20 @@
|
|||
diff --git a/meson.build b/meson.build
|
||||
index 5253f52..f5ff82e 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -6,7 +6,6 @@ project(
|
||||
|
||||
# Define dependecies
|
||||
dep_gtk3 = dependency('gtk+-3.0')
|
||||
-dep_wlroots = dependency('wlroots')
|
||||
dep_wayland_client = dependency('wayland-client')
|
||||
|
||||
|
||||
@@ -75,7 +74,6 @@ executable(
|
||||
'wl-gammactl',
|
||||
sources,
|
||||
dependencies : [
|
||||
- dep_wlroots,
|
||||
dep_wayland_client,
|
||||
dep_gtk3
|
||||
],
|
|
@ -4861,9 +4861,7 @@ with pkgs;
|
|||
|
||||
wlsunset = callPackage ../tools/wayland/wlsunset { };
|
||||
|
||||
wl-gammactl = callPackage ../tools/wayland/wl-gammactl {
|
||||
wlroots = wlroots_0_15;
|
||||
};
|
||||
wl-gammactl = callPackage ../tools/wayland/wl-gammactl { };
|
||||
|
||||
wluma = callPackage ../tools/wayland/wluma { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue