mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
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.
This commit is contained in:
parent
6c23abf5ef
commit
6e21976092
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue