Skip to content

Commit

Permalink
wireshark: Do $PATH lookup in wireshark.desktop instead of hardcoding…
Browse files Browse the repository at this point in the history
… derivation

See db236e5 "steam: Do $PATH lookup in steam.desktop [...]".
tl;dr: Otherwise widget/panel/desktop icons in DEs like KDE break.

As upstream's .desktop file does not contain any executable paths,
simply avoid substitution.

Message-Id: <97c3e797-d844-4d0a-9ccf-397745f83aeb@siticom.de>
(cherry picked from commit 251349d)
  • Loading branch information
Klemens Nanni authored and Ma27 committed Dec 22, 2020
1 parent 3160ac6 commit 0a94f27
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions pkgs/applications/networking/sniffers/wireshark/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@ in stdenv.mkDerivation {
'' else optionalString withQt ''
install -Dm644 -t $out/share/applications ../wireshark.desktop
substituteInPlace $out/share/applications/*.desktop \
--replace "Exec=wireshark" "Exec=$out/bin/wireshark"
install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg
mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv
Expand Down

0 comments on commit 0a94f27

Please sign in to comment.