diff --git a/pkgs/tools/wayland/wl-gammactl/default.nix b/pkgs/tools/wayland/wl-gammactl/default.nix index 3aae67b47359..c6410872790d 100644 --- a/pkgs/tools/wayland/wl-gammactl/default.nix +++ b/pkgs/tools/wayland/wl-gammactl/default.nix @@ -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'" ''; diff --git a/pkgs/tools/wayland/wl-gammactl/dont-need-wlroots.diff b/pkgs/tools/wayland/wl-gammactl/dont-need-wlroots.diff new file mode 100644 index 000000000000..a5eeab64a7bb --- /dev/null +++ b/pkgs/tools/wayland/wl-gammactl/dont-need-wlroots.diff @@ -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 + ], diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7142efa006c2..aaa387ad7ea6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };