From 2b1c2cb1cd763b3181753efbccb08d5888495ae3 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 30 Dec 2023 20:48:43 +0100 Subject: [PATCH] waybar-mpris: cleanup Go flags - fix strip flags by setting as ldflags - remove `-trimpath`, this is set by buildGoModule - remove `-modcacherw`, `-mod=readonly`, `-linkmode=external` as flags had no effect (check hash of binary when removing) - remove `-buildmode=pie` (not sure why we would need a PIE here) --- pkgs/by-name/wa/waybar-mpris/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/wa/waybar-mpris/package.nix b/pkgs/by-name/wa/waybar-mpris/package.nix index 253829d9abec..d9726f2213ff 100644 --- a/pkgs/by-name/wa/waybar-mpris/package.nix +++ b/pkgs/by-name/wa/waybar-mpris/package.nix @@ -18,9 +18,10 @@ buildGoModule { nativeBuildInputs = [ installShellFiles ]; - CGO_LDFLAGS = "-s -w"; - - GOFLAGS = "-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"; + ldflags = [ + "-s" + "-w" + ]; meta = with lib; { description = "A waybar component/utility for displaying and controlling MPRIS2 compliant media players individually"; @@ -30,4 +31,3 @@ buildGoModule { maintainers = with maintainers; [ khaneliman ]; }; } -