From f2fba69fe67fdeab96a100fef27fbea1fe30ee74 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 May 2023 23:01:59 +0200 Subject: [PATCH] wireshark: do not install redundant files The icon we were installing is an old one that should not be used these days: https://gitlab.com/wireshark/wireshark/-/merge_requests/10507 And the CMake build script already installs the desktop file and icons in a more proper location since 2.4.0: https://gitlab.com/wireshark/wireshark/-/commit/c27404655650a3648f576663d07394105fd5ef30 --- pkgs/applications/networking/sniffers/wireshark/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 94bbb480663f..347e2dac66ad 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -138,9 +138,7 @@ stdenv.mkDerivation { '' else lib.optionalString withQt '' pwd - install -Dm644 -t $out/share/applications ../resources/freedesktop/org.wireshark.Wireshark.desktop - install -Dm644 ../resources/icons/wsicon.svg $out/share/icons/wireshark.svg mkdir -pv $dev/include/{epan/{wmem,ftypes,dfilter},wsutil/wmem,wiretap} cp config.h $dev/include/wireshark/