diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index 3dd4010b0f44..e6ed87ffabd3 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wf-config libGL libdrm libexecinfo @@ -55,14 +54,15 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon wayland-protocols xorg.xcbutilwm - wayland - cairo - pango nlohmann_json ]; propagatedBuildInputs = [ + wf-config wlroots + wayland + cairo + pango ]; nativeCheckInputs = [ diff --git a/pkgs/applications/window-managers/wayfire/firedecor.nix b/pkgs/applications/window-managers/wayfire/firedecor.nix index ce42f6fc6886..6fbe4b5575bb 100644 --- a/pkgs/applications/window-managers/wayfire/firedecor.nix +++ b/pkgs/applications/window-managers/wayfire/firedecor.nix @@ -5,17 +5,13 @@ , ninja , pkg-config , boost -, cairo , glib , libGL , libinput , librsvg , libxkbcommon -, pango , udev , wayfire -, wayland -, wf-config , xcbutilwm , mate }: @@ -39,17 +35,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost - cairo glib libGL libinput librsvg libxkbcommon - pango udev wayfire - wayland - wf-config xcbutilwm ]; diff --git a/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix b/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix index 6c42cbd5531e..99f11c6fd789 100644 --- a/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix +++ b/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix @@ -6,10 +6,6 @@ , ninja , pkg-config , wayfire -, wayland -, wf-config -, cairo -, pango , libxkbcommon , libGL }: @@ -33,10 +29,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ wayfire - wayland - wf-config - cairo - pango libxkbcommon libGL ]; diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index 1acd161e6211..fec3b1bfc716 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -4,11 +4,9 @@ , meson , ninja , pkg-config -, wayland , wrapGAppsHook , wayfire , wf-shell -, wf-config , wayland-scanner , wayland-protocols , gtk3 @@ -40,9 +38,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ wayfire - wf-config wf-shell - wayland wayland-protocols gtk3 gtkmm3 diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix index b71e667b31ad..348ef56be5d8 100644 --- a/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -6,7 +6,6 @@ , pkg-config , wayland-scanner , wayfire -, wf-config , alsa-lib , gtkmm3 , gtk-layer-shell @@ -35,7 +34,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ wayfire - wf-config alsa-lib gtkmm3 gtk-layer-shell diff --git a/pkgs/applications/window-managers/wayfire/windecor.nix b/pkgs/applications/window-managers/wayfire/windecor.nix index d3643aa18095..29c95ff1a91d 100644 --- a/pkgs/applications/window-managers/wayfire/windecor.nix +++ b/pkgs/applications/window-managers/wayfire/windecor.nix @@ -5,9 +5,6 @@ , ninja , pkg-config , wayfire -, wf-config -, wayland -, pango , eudev , libinput , libxkbcommon @@ -40,9 +37,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ wayfire - wf-config - wayland - pango eudev libinput libxkbcommon diff --git a/pkgs/applications/window-managers/wayfire/wwp-switcher.nix b/pkgs/applications/window-managers/wayfire/wwp-switcher.nix index 5a2f71129e28..9ca4718e1709 100644 --- a/pkgs/applications/window-managers/wayfire/wwp-switcher.nix +++ b/pkgs/applications/window-managers/wayfire/wwp-switcher.nix @@ -6,10 +6,6 @@ , ninja , pkg-config , wayfire -, wayland -, wf-config -, cairo -, pango , libxkbcommon , libGL , libinput @@ -37,10 +33,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ wayfire - wayland - wf-config - cairo - pango libxkbcommon libGL libinput