Merge pull request #289595 from coffee-is-power/patch-1

eww: unstable-2023-08-18 -> 0.5.0
This commit is contained in:
Atemu 2024-02-26 20:20:03 +00:00 committed by GitHub
commit 6d7b0ddfe0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 15 deletions

View File

@ -5,32 +5,26 @@
, wrapGAppsHook
, gtk3
, librsvg
, withWayland ? false
, gtk-layer-shell
, stdenv
}:
rustPlatform.buildRustPackage rec {
pname = "eww";
version = "unstable-2023-08-18";
version = "0.5.0";
src = fetchFromGitHub {
owner = "elkowar";
repo = "eww";
rev = "a9a35c1804d72ef92e04ee71555bd9e5a08fa17e";
hash = "sha256-GEysmNDm+olt1WXHzRwb4ZLifkXmeP5+APAN3b81/Og=";
rev = "v${version}";
hash = "sha256-HBBz1NDtj2TnDK5ghDLRrAOwHXDZlzclvVscYnmKGck=";
};
cargoHash = "sha256-4yeu5AgleZMOLKNynGMd0XuyZxyyZ+RmzNtuJiNPN8g=";
cargoHash = "sha256-IirFE714NZmppLjwbWk6fxcmRXCUFzB4oxOxBvmYu5U=";
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" ];
@ -43,7 +37,7 @@ rustPlatform.buildRustPackage rec {
description = "ElKowars wacky widgets";
homepage = "https://github.com/elkowar/eww";
license = licenses.mit;
maintainers = with maintainers; [ figsoda lom ];
maintainers = with maintainers; [ figsoda lom coffeeispower ];
mainProgram = "eww";
broken = stdenv.isDarwin;
};

View File

@ -281,6 +281,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 ###

View File

@ -31136,9 +31136,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 { };