From a2dbb644c3b0146c14c02d78ee2be1de34781fc8 Mon Sep 17 00:00:00 2001 From: éclairevoyant <848000+eclairevoyant@users.noreply.github.com> Date: Sun, 21 Apr 2024 12:30:50 -0400 Subject: eww: move to `pkgs/by-name` --- pkgs/applications/window-managers/eww/default.nix | 44 ----------------------- pkgs/by-name/ew/eww/package.nix | 44 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 44 insertions(+), 46 deletions(-) delete mode 100644 pkgs/applications/window-managers/eww/default.nix create mode 100644 pkgs/by-name/ew/eww/package.nix (limited to 'pkgs') diff --git a/pkgs/applications/window-managers/eww/default.nix b/pkgs/applications/window-managers/eww/default.nix deleted file mode 100644 index b245941fc7d49..0000000000000 --- a/pkgs/applications/window-managers/eww/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, wrapGAppsHook -, gtk3 -, librsvg -, gtk-layer-shell -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "eww"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "elkowar"; - repo = "eww"; - rev = "v${version}"; - hash = "sha256-HBBz1NDtj2TnDK5ghDLRrAOwHXDZlzclvVscYnmKGck="; - }; - - cargoHash = "sha256-IirFE714NZmppLjwbWk6fxcmRXCUFzB4oxOxBvmYu5U="; - - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - - buildInputs = [ gtk3 librsvg gtk-layer-shell ]; - - cargoBuildFlags = [ "--bin" "eww" ]; - - cargoTestFlags = cargoBuildFlags; - - # requires unstable rust features - RUSTC_BOOTSTRAP = 1; - - meta = with lib; { - description = "ElKowars wacky widgets"; - homepage = "https://github.com/elkowar/eww"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda lom coffeeispower ]; - mainProgram = "eww"; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix new file mode 100644 index 0000000000000..b245941fc7d49 --- /dev/null +++ b/pkgs/by-name/ew/eww/package.nix @@ -0,0 +1,44 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, wrapGAppsHook +, gtk3 +, librsvg +, gtk-layer-shell +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "eww"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "elkowar"; + repo = "eww"; + rev = "v${version}"; + hash = "sha256-HBBz1NDtj2TnDK5ghDLRrAOwHXDZlzclvVscYnmKGck="; + }; + + cargoHash = "sha256-IirFE714NZmppLjwbWk6fxcmRXCUFzB4oxOxBvmYu5U="; + + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + + buildInputs = [ gtk3 librsvg gtk-layer-shell ]; + + cargoBuildFlags = [ "--bin" "eww" ]; + + cargoTestFlags = cargoBuildFlags; + + # requires unstable rust features + RUSTC_BOOTSTRAP = 1; + + meta = with lib; { + description = "ElKowars wacky widgets"; + homepage = "https://github.com/elkowar/eww"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda lom coffeeispower ]; + mainProgram = "eww"; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d86301632c8b3..6a258db138313 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30759,8 +30759,6 @@ with pkgs; evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { }; - eww = callPackage ../applications/window-managers/eww { }; - exaile = callPackage ../applications/audio/exaile { }; exercism = callPackage ../applications/misc/exercism { }; -- cgit 1.4.1