git.iko.soy/typeable/nixpkgs
on master help sign in
wireshark: Do $PATH lookup in wireshark.desktop instead of hardcoding derivation

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>

commit251349dac30e4de0d9d0c982ccbe4e12c3217ccb authorKlemens Nanni <klemens.nanni@siticom.de> dateWed 18 Nov 2020, 23:30 (6 years ago) parent5d5e970
1 file changed−3
pkgs/applications/networking/sniffers/wireshark/default.nix−3
pkgs/applications/networking/sniffers/wireshark/default.nix−3
@@ -80,9 +80,6 @@ in stdenv.mkDerivation {
8080 '' else optionalString withQt ''
8181 install -Dm644 -t $out/share/applications ../wireshark.desktop
8282
83− substituteInPlace $out/share/applications/*.desktop \
84− --replace "Exec=wireshark" "Exec=$out/bin/wireshark"
85−
8683 install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg
8784 mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv
8885