public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wireshark: Do $PATH lookup in wireshark.desktop instead of hardcoding derivation

Browse Source 
See db236e588de "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>
This commit is contained in:
Klemens Nanni 2020-11-18 23:30:58 +01:00 committed by Andreas Rammhold
parent 5d5e970ce0
commit 251349dac3
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@ -80,9 +80,6 @@ in stdenv.mkDerivation {
'' else optionalString withQt '' '' else optionalString withQt ''
install -Dm644 -t $out/share/applications ../wireshark.desktop 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 install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg
mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv