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

Merge pull request #61415 from teto/wireshark_cleanup

Browse Source 
wireshark: cleanup
This commit is contained in:
Jaka Hudoklin 2019-05-13 10:45:58 +02:00 committed by GitHub
commit 053b58a7a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,8 @@ let
variant = if withQt then "qt" else "cli"; variant = if withQt then "qt" else "cli";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "wireshark-${variant}-${version}"; pname = "wireshark-${variant}";
inherit version;
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
@ -24,7 +25,6 @@ in stdenv.mkDerivation {
cmakeFlags = [ cmakeFlags = [
"-DBUILD_wireshark=${if withQt then "ON" else "OFF"}" "-DBUILD_wireshark=${if withQt then "ON" else "OFF"}"
"-DENABLE_QT5=${if withQt then "ON" else "OFF"}"
"-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}" "-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}"
]; ];
@ -95,6 +95,8 @@ in stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
dontFixCmake = true;
shellHook = '' shellHook = ''
# to be able to run the resulting binary # to be able to run the resulting binary
export WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 export WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1