diff --git a/pkgs/by-name/gp/gpclient/package.nix b/pkgs/by-name/gp/gpclient/package.nix index 9d39e189cb9b..4320bf280126 100644 --- a/pkgs/by-name/gp/gpclient/package.nix +++ b/pkgs/by-name/gp/gpclient/package.nix @@ -13,6 +13,7 @@ gmp, gnutls, gnugrep, + gnused, gpauth, gtk3, iproute2, @@ -29,6 +30,7 @@ perl, pkg-config, systemd, + unixtools, zlib, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, }: @@ -130,7 +132,9 @@ rustPlatform.buildRustPackage { coreutils gawk gnugrep + gnused net-tools + unixtools.ps ] ++ lib.optionals stdenv.hostPlatform.isLinux [ iproute2 @@ -144,6 +148,17 @@ rustPlatform.buildRustPackage { substituteInPlace $out/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down \ --replace-fail /usr/bin/gpclient $out/bin/gpclient + # The dispatcher skips dotfiles, so the .gpclient-nm-hook-wrapped + # payload next to the wrapper is not run as a second script. + wrapProgram "$out/lib/NetworkManager/dispatcher.d/gpclient-nm-hook" \ + --prefix PATH : "${ + lib.makeBinPath [ + coreutils + gnugrep + unixtools.ps + ] + }" + install -Dm644 packaging/files/usr/share/applications/gpgui.desktop \ $out/share/applications/gpgui.desktop substituteInPlace $out/share/applications/gpgui.desktop \