From f644364e7f8b029a85ba7c85eab148c76c734cda Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 7 Nov 2024 12:32:03 +0800 Subject: [PATCH 1/2] nwg-dock-hyprland: move to pkgs/by-name --- .../default.nix => by-name/nw/nwg-dock-hyprland/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/nwg-dock-hyprland/default.nix => by-name/nw/nwg-dock-hyprland/package.nix} (100%) diff --git a/pkgs/applications/misc/nwg-dock-hyprland/default.nix b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix similarity index 100% rename from pkgs/applications/misc/nwg-dock-hyprland/default.nix rename to pkgs/by-name/nw/nwg-dock-hyprland/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ff8d0027675..9063b154cf79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30970,8 +30970,6 @@ with pkgs; nwg-dock = callPackage ../applications/misc/nwg-dock { }; - nwg-dock-hyprland = callPackage ../applications/misc/nwg-dock-hyprland { }; - nwg-launchers = callPackage ../applications/misc/nwg-launchers { }; nwg-look = callPackage ../applications/misc/nwg-look { }; From 5214dfb6814498ae885105c8c760b99808cc0a20 Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 7 Nov 2024 13:40:56 +0800 Subject: [PATCH 2/2] nwg-dock-hyprland: 0.2.2 -> 0.3.2 Diff: https://github.com/nwg-piotr/nwg-dock-hyprland/compare/v0.2.2...v0.3.2 --- pkgs/by-name/nw/nwg-dock-hyprland/package.nix | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix index 34bbf45e8ebd..a401438a0dca 100644 --- a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix +++ b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix @@ -1,27 +1,35 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, pkg-config -, wrapGAppsHook3 -, gtk-layer-shell +{ + lib, + buildGoModule, + fetchFromGitHub, + pkg-config, + wrapGAppsHook3, + gtk-layer-shell, }: buildGoModule rec { pname = "nwg-dock-hyprland"; - version = "0.2.2"; + version = "0.3.2"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-dock-hyprland"; - rev = "v${version}"; - hash = "sha256-iamDOQcQJRdFVnwffWPIXHlY0J4orfrEbfLzaoeV+KM="; + rev = "refs/tags/v${version}"; + hash = "sha256-Vp8JmRQf71vezdknzifxlK7zTlorwiEHsyXpmy6mxIE="; }; - vendorHash = "sha256-cZ5w7B8bi0faOVWoQ6eeW5ejCZJgnNB91DQalC75mPo="; + vendorHash = "sha256-RBU0l4YRtV5JPH1dLT+lZ05jmxRwyn3glMUKHw1Eg8g="; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + ]; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ gtk-layer-shell ]; postInstall = ''