From 951b5edd726ec21b1419e525c3efa2473c6f33bb Mon Sep 17 00:00:00 2001
From: huantian <davidtianli@gmail.com>
Date: Thu, 16 Mar 2023 19:07:07 -0700
Subject: [PATCH] webcord: name -> pname, suffix xdg-utils to PATH

---
 .../networking/instant-messengers/webcord/default.nix    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/webcord/default.nix b/pkgs/applications/networking/instant-messengers/webcord/default.nix
index d03205720312..188158e70b6d 100644
--- a/pkgs/applications/networking/instant-messengers/webcord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/webcord/default.nix
@@ -2,7 +2,7 @@
 , python3, pipewire, libpulseaudio, xdg-utils, electron_22, makeDesktopItem }:
 
 buildNpmPackage rec {
-  name = "webcord";
+  pname = "webcord";
   version = "4.1.1";
 
   src = fetchFromGitHub {
@@ -24,10 +24,6 @@ buildNpmPackage rec {
     libpulseaudio
   ];
 
-  binPath = lib.makeBinPath [
-    xdg-utils
-  ];
-
   # npm install will error when electron tries to download its binary
   # we don't need it anyways since we wrap the program with our nixpkgs electron
   ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
@@ -49,9 +45,10 @@ buildNpmPackage rec {
 
     install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png
 
+    # Add xdg-utils to path via suffix, per PR #181171
     makeWrapper '${electron_22}/bin/electron' $out/bin/webcord \
       --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \
-      --prefix PATH : "${binPath}" \
+      --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \
       --add-flags $out/lib/node_modules/webcord/