Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 4c54e3450541
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: ae24fad5abff
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 19, 2018

  1. Revert "wireshark-gtk: Fix build" 

    This reverts commit 089d869

Revert "wireshark-cli: Fix build"

This reverts commit ab76932
    @adisbladis
    adisbladis committed Jan 19, 2018
    Copy the full SHA
    0e2e25d View commit details
    Browse the repository at this point in the history

  2. wireshark-gtk: explicitly disable the Qt build when building Gtk 

    In a recent Cmake(?) or wireshark release the default behaviour did
change. A failing build log can be seen at hydra [1].

[1] https://hydra.nixos.org/build/67179559/nixlog/1

(cherry picked from commit c77e053)
    @andir @adisbladis
    andir authored and adisbladis committed Jan 19, 2018
    Copy the full SHA
    4447281 View commit details
    Browse the repository at this point in the history

  3. wireshark: en- & disable Gtk/Qt separately 

    This should also fix the wireshark-cli variant

(cherry picked from commit 969d61d)
    @andir @adisbladis
    andir authored and adisbladis committed Jan 19, 2018
    Copy the full SHA
    ae24fad View commit details
    Browse the repository at this point in the history