diff --git a/pkgs/applications/window-managers/eww/default.nix b/pkgs/applications/window-managers/eww/default.nix index 9cb41bafc906..b245941fc7d4 100644 --- a/pkgs/applications/window-managers/eww/default.nix +++ b/pkgs/applications/window-managers/eww/default.nix @@ -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" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3dc17fe57bfb..5cc6843f102e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbef460b03a5..2037f932db65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };