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

wireshark: fix darwin build

Browse Source 
Fixing the cycle in the cmake files is also needed on darwin.
This commit is contained in:
Daiderd Jordan 2019-04-08 21:46:15 +02:00 committed by Matthieu Coudron
parent 5e19cec491
commit 064bcdb22f
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,11 @@ in stdenv.mkDerivation {
export LD_LIBRARY_PATH="$PWD/run" export LD_LIBRARY_PATH="$PWD/run"
''; '';
postInstall = if (stdenv.isDarwin && withQt) then '' postInstall = ''
# to remove "cycle detected in the references"
mkdir -p $dev/lib/wireshark
mv $out/lib/wireshark/cmake $dev/lib/wireshark
'' + (if stdenv.isDarwin && withQt then ''
mkdir -p $out/Applications mkdir -p $out/Applications
mv $out/bin/Wireshark.app $out/Applications/Wireshark.app mv $out/bin/Wireshark.app $out/Applications/Wireshark.app
@ -87,12 +91,7 @@ in stdenv.mkDerivation {
cp ../epan/dfilter/*.h $dev/include/epan/dfilter/ cp ../epan/dfilter/*.h $dev/include/epan/dfilter/
cp ../wsutil/*.h $dev/include/wsutil/ cp ../wsutil/*.h $dev/include/wsutil/
cp ../wiretap/*.h $dev/include/wiretap cp ../wiretap/*.h $dev/include/wiretap
'');
'' + ''
# to remove "cycle detected in the references"
mkdir -p $dev/lib/wireshark
mv $out/lib/wireshark/cmake $dev/lib/wireshark
'';
enableParallelBuilding = true; enableParallelBuilding = true;