Commit 07cc28b7 authored by Tiago Lagger's avatar Tiago Lagger Committed by Tiago Dinis
Browse files

eww: deprecate eww-wayland package 

eww: warn when using eww-wayland package

eww: move eww-wayland to `aliases.nix`

eww: use eww package in eww-wayland alias

eww: remove withWayland flag
parent 38e0e9b2

pkgs/applications/window-managers/eww/default.nix

+1 −7
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
, wrapGAppsHook

, gtk3

, librsvg

, withWayland ? false

, gtk-layer-shell

, stdenv

}:
@@ -25,12 +24,7 @@ rustPlatform.buildRustPackage rec { 


  nativeBuildInputs = [ pkg-config wrapGAppsHook ];



  buildInputs = [ gtk3 librsvg ] ++ lib.optional withWayland gtk-layer-shell;



  buildNoDefaultFeatures = true;

  buildFeatures = [

    (if withWayland then "wayland" else "x11")

  ];

  buildInputs = [ gtk3 librsvg gtk-layer-shell ];



  cargoBuildFlags = [ "--bin" "eww" ];

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ mapAliases ({ 
  eterm = throw "eterm was removed because it is still insecure: https://github.com/mej/Eterm/issues/7"; # Added 2023-09-10

  exa = throw "'exa' has been removed because it is unmaintained upstream. Consider using 'eza', a maintained fork"; # Added 2023-09-07

  exhibitor = throw "'exhibitor' has been removed because it is unmaintained upstream"; # Added 2023-06-20

  eww-wayland = lib.warn "eww now can build for X11 and wayland simultaneously, so `eww-wayland` is deprecated, use the normal `eww` package instead." eww;



  ### F ###

pkgs/top-level/all-packages.nix

+0 −3
Original line number Diff line number Diff line
@@ -31219,9 +31219,6 @@ with pkgs; 
  evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { };















  eww = callPackage ../applications/window-managers/eww { };













  eww-wayland = callPackage ../applications/window-managers/eww {













    withWayland = true;













  };





























  exaile = callPackage ../applications/audio/exaile { };