Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wireshark-*: pass in overridden libpcap in all-packages.nix #96950

Merged
merged 1 commit into from Jan 3, 2021

Conversation

Izorkin
Copy link
Contributor

@Izorkin Izorkin commented Sep 2, 2020

Motivation for this change

Build wireshark-cli wothout bluetooth

cc @justin-gerhardt @bjornfor

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@justin-gerhardt
Copy link
Contributor

It seems the root issue is the bluez occasionally errors on build per #91011. As far as I can tell this is nothing specifically to do with wireshare itself. If bluez is to be removed as a dependency it doesn't really make sense to do that to the cli version for wireshark but not the QT version. Personally, given the 9 out of 1000 failure rate I don't think this is warrented.

@Izorkin
Copy link
Contributor Author

Izorkin commented Sep 2, 2020

My build bluez always freezing.

@Izorkin
Copy link
Contributor Author

Izorkin commented Sep 2, 2020

On servers are unlikely to used bluetooth.

@Izorkin
Copy link
Contributor Author

Izorkin commented Jan 2, 2021

cc @Mic92 @flokli @aanderse

Copy link
Contributor

@flokli flokli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As written in #91011, bluez seems a bit flaky in general. We shouldn't try to patch this around in other things consuming bluez, but fix it properly.

Please move the libpcap override to all-packages.nix (as you did), but keep with withBluez = stdenv.isLinux; as is.

You can then easily override wireshark-cli in your server overlay.

People might want to still have wireshark-cli with bluez support.

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
@flokli
Copy link
Contributor

flokli commented Jan 3, 2021

The commit message is still the old one (and we don't disable bluetooth anymore). Maybe

wireshark-*: pass in overridden libpcap in all-packages.nix

This allows building wireshark-* with a explicitly disabled bluezSupport in an overlay.

@Izorkin Izorkin changed the title wireshark-cli: disable bluetooth wireshark-*: pass in overridden libpcap in all-packages.nix Jan 3, 2021
@Izorkin
Copy link
Contributor Author

Izorkin commented Jan 3, 2021

Thanks, update.

This allows building wireshark-* with a explicitly disabled bluezSupport
in an overlay.
@flokli flokli merged commit 90bc79c into NixOS:master Jan 3, 2021
@Izorkin Izorkin deleted the wireshark-cli branch January 4, 2021 05:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants