From cda15ef3d66429e23ae21a8b3ef0626813608ab0 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 18 Nov 2023 04:18:56 -0300 Subject: nwg-drawer: migrate to by-name --- pkgs/applications/misc/nwg-drawer/default.nix | 51 --------------------------- pkgs/by-name/nw/nwg-drawer/package.nix | 51 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 51 insertions(+), 53 deletions(-) delete mode 100644 pkgs/applications/misc/nwg-drawer/default.nix create mode 100644 pkgs/by-name/nw/nwg-drawer/package.nix diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix deleted file mode 100644 index 6e7af27f3b1..00000000000 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, cairo -, gobject-introspection -, gtk3 -, gtk-layer-shell -, pkg-config -, wrapGAppsHook -, xdg-utils }: - -buildGoModule rec { - pname = "nwg-drawer"; - version = "0.3.9"; - - src = fetchFromGitHub { - owner = "nwg-piotr"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-RCryDei8Tw1f+7y8iIDC3mASv5nwq4qrWRc4CudS/Cg="; - }; - - vendorHash = "sha256-YwXX3srQdCicJlstodqOsL+dwBNVyJx/SwC2dMOUBh4="; - - buildInputs = [ cairo gtk3 gtk-layer-shell ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook gobject-introspection ]; - - doCheck = false; - - preInstall = '' - mkdir -p $out/share/nwg-drawer - cp -r desktop-directories drawer.css $out/share/nwg-drawer - ''; - - preFixup = '' - # make xdg-open overrideable at runtime - gappsWrapperArgs+=( - --suffix PATH : ${xdg-utils}/bin - --prefix XDG_DATA_DIRS : $out/share - ) - ''; - - meta = with lib; { - description = "Application drawer for sway Wayland compositor"; - homepage = "https://github.com/nwg-piotr/nwg-drawer"; - license = licenses.mit; - platforms = platforms.linux; - mainProgram = "nwg-drawer"; - maintainers = with maintainers; [ plabadens ]; - }; -} diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix new file mode 100644 index 00000000000..6e7af27f3b1 --- /dev/null +++ b/pkgs/by-name/nw/nwg-drawer/package.nix @@ -0,0 +1,51 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, cairo +, gobject-introspection +, gtk3 +, gtk-layer-shell +, pkg-config +, wrapGAppsHook +, xdg-utils }: + +buildGoModule rec { + pname = "nwg-drawer"; + version = "0.3.9"; + + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-RCryDei8Tw1f+7y8iIDC3mASv5nwq4qrWRc4CudS/Cg="; + }; + + vendorHash = "sha256-YwXX3srQdCicJlstodqOsL+dwBNVyJx/SwC2dMOUBh4="; + + buildInputs = [ cairo gtk3 gtk-layer-shell ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook gobject-introspection ]; + + doCheck = false; + + preInstall = '' + mkdir -p $out/share/nwg-drawer + cp -r desktop-directories drawer.css $out/share/nwg-drawer + ''; + + preFixup = '' + # make xdg-open overrideable at runtime + gappsWrapperArgs+=( + --suffix PATH : ${xdg-utils}/bin + --prefix XDG_DATA_DIRS : $out/share + ) + ''; + + meta = with lib; { + description = "Application drawer for sway Wayland compositor"; + homepage = "https://github.com/nwg-piotr/nwg-drawer"; + license = licenses.mit; + platforms = platforms.linux; + mainProgram = "nwg-drawer"; + maintainers = with maintainers; [ plabadens ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 236ac992be8..10dade171a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34072,8 +34072,6 @@ with pkgs; nwg-dock-hyprland = callPackage ../applications/misc/nwg-dock-hyprland { }; - nwg-drawer = callPackage ../applications/misc/nwg-drawer { }; - nwg-launchers = callPackage ../applications/misc/nwg-launchers { }; nwg-look = callPackage ../applications/misc/nwg-look { }; -- cgit 1.4.1