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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 59e940007106
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c85d0beca537
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 9, 2018

  1. wireshark: run binary from nix-shell 

    when in a shell, export variable WIRESHARK_RUN_FROM_BUILD_DIRECTORY to be able to run the newly built wireshark
else one get:
./build/run/wireshark: error while loading shared libraries: libwscodecs.so.0: cannot open shared object file: No such file or directory

see #29638
    @teto
    teto committed May 9, 2018
    Copy the full SHA
    ab613b9 View commit details

  2. Merge pull request #40204 from teto/wireshark_hook 

    wireshark: run binary from nix-shell
    @xeji
    xeji authored May 9, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c85d0be View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 pkgs/applications/networking/sniffers/wireshark/default.nix
5 changes: 5 additions & 0 deletions pkgs/applications/networking/sniffers/wireshark/default.nix
View file
Original file line number Diff line number Diff line change
@@ -82,6 +82,11 @@ in stdenv.mkDerivation {

enableParallelBuilding = true;

shellHook = ''
# to be able to run the resulting binary
export WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1
'';

meta = with stdenv.lib; {
homepage = https://www.wireshark.org/;
description = "Powerful network protocol analyzer";