Commit e92eba7c authored by rewine's avatar rewine Committed by Matthieu Coudron
Browse files

wl-gammactl: don't need wlroots

parent bbb4adee

pkgs/tools/wayland/wl-gammactl/default.nix

+4 −2
Original line number Diff line number Diff line 
{ 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'"

  '';

pkgs/tools/wayland/wl-gammactl/dont-need-wlroots.diff

0 → 100644
+20 −0
Original line number Diff line number Diff line 
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

 	],

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -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 {  };