diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2019-05-13 10:11:48 +0900 |
|---|---|---|
| committer | Matthieu Coudron <mattator@gmail.com> | 2019-05-13 10:16:48 +0900 |
| commit | 6e219760926d2e69e282abd8cc4b317f37ad2000 (patch) | |
| tree | a42c9e16bc10f093f4805f1e34815dd319539ce0 /pkgs/applications/networking/sniffers/wireshark/default.nix | |
| parent | 6c23abf5eff1115086bec0a6efaee0d175a544b1 (diff) | |
| download | nixlib-6e219760926d2e69e282abd8cc4b317f37ad2000.tar nixlib-6e219760926d2e69e282abd8cc4b317f37ad2000.tar.gz nixlib-6e219760926d2e69e282abd8cc4b317f37ad2000.tar.bz2 nixlib-6e219760926d2e69e282abd8cc4b317f37ad2000.tar.lz nixlib-6e219760926d2e69e282abd8cc4b317f37ad2000.tar.xz nixlib-6e219760926d2e69e282abd8cc4b317f37ad2000.tar.zst nixlib-6e219760926d2e69e282abd8cc4b317f37ad2000.zip | |
wireshark: cleanup
the call to fixCmakeFiles looks useless and just pollutes git status when developing on wireshark. I also removed an old variable that generated a warning.
Diffstat (limited to 'pkgs/applications/networking/sniffers/wireshark/default.nix')
| -rw-r--r-- | pkgs/applications/networking/sniffers/wireshark/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 46869ecb24f2..b9d973287d29 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -14,7 +14,8 @@ let variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { - name = "wireshark-${variant}-${version}"; + pname = "wireshark-${variant}"; + inherit version; outputs = [ "out" "dev" ]; src = fetchurl { @@ -24,7 +25,6 @@ in stdenv.mkDerivation { cmakeFlags = [ "-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"}" ]; @@ -95,6 +95,8 @@ in stdenv.mkDerivation { enableParallelBuilding = true; + dontFixCmake = true; + shellHook = '' # to be able to run the resulting binary export WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 |