Unverified Commit 916d21a8 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #221526 from wegank/qtwirediff-darwin 

qtwirediff: add darwin support
parents 127fe436 a66d2f6b

pkgs/applications/networking/sniffers/qtwirediff/default.nix

+7 −0
Original line number Diff line number Diff line
@@ -27,14 +27,21 @@ stdenv.mkDerivation { 


  buildInputs = [

    qtbase

  ] ++ lib.optionals stdenv.isLinux [

    qtwayland

  ];



  installPhase = ''

    runHook preInstall

  '' + lib.optionalString stdenv.isDarwin ''

    mkdir -p $out/Applications

    cp -r qtwirediff.app $out/Applications

    makeWrapper $out/{Applications/qtwirediff.app/Contents/MacOS,bin}/qtwirediff

  '' + lib.optionalString stdenv.isLinux ''

    install -Dm755 -T qtwirediff $out/bin/qtwirediff

    wrapProgram $out/bin/qtwirediff \

      --prefix PATH : "${lib.makeBinPath [ wireshark-cli ]}"

  '' + ''

    runHook postInstall

  '';

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -29943,7 +29943,7 @@ with pkgs; 
  };

  wireshark-qt = wireshark;













  qtwirediff = qt6.callPackage ../applications/networking/sniffers/qtwirediff {};













  qtwirediff = qt6Packages.callPackage ../applications/networking/sniffers/qtwirediff {};





























  tshark = wireshark-cli;















  wireshark-cli = wireshark.override {