From a69d39e5d6bbd464429b97325c5b03171540f7be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac=20Jacqu=C3=A9?= Date: Wed, 13 Sep 2023 19:51:44 +0200 Subject: [PATCH] Add Nix build. --- default.nix | 26 +++++++++++++++++++------- flake.nix | 5 ++--- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/default.nix b/default.nix index 331bab9..e6fd6d6 100644 --- a/default.nix +++ b/default.nix @@ -1,10 +1,22 @@ { pkgs ? import {} }: -pkgs.stdenv.mkDerivation { - pname = "nix-dissector"; - version = "1.0"; - nativeBuildInputs = [ pkgs.autoreconfHook pkgs.pkg-config ]; - buildInputs = [ pkgs.wireshark.dev pkgs.glib ]; - src = pkgs.lib.cleanSource ./.; - +let + # There's a bug upstream. Using my fork until + # https://github.com/mechpen/sockdump/pull/23 gets merged and + # Nixpkgs bumped. + sockdump = pkgs.sockdump.overrideAttrs(old: { + src = pkgs.fetchFromGitHub { + owner = "NinjaTrappeur"; + repo = "sockdump"; + rev = "5a45e06bc73938334de1375127e82d240b1d7477"; + hash = "sha256-q6jdwFhl2G9o2C0BVU6Xz7xizO00yaSQ2KSR/z4fixY="; + }; + }); +in pkgs.writeShellApplication { + name = "snoop-nix-daemon"; + runtimeInputs = [ pkgs.wireshark sockdump ]; + text = '' + sudo ls + sudo sockdump --format pcap /nix/var/nix/daemon-socket/socket | wireshark -X lua_script:${./nix-packet.lua} -k -i - + ''; } diff --git a/flake.nix b/flake.nix index 0ee494a..32aba8c 100644 --- a/flake.nix +++ b/flake.nix @@ -7,8 +7,7 @@ outputs = { self, nixpkgs }: { - packages.x86_64-linux.nix-dissector = import ./default.nix { inherit (nixpkgs.legacyPackages.x86_64-linux) pkgs; }; - - devShells.x86_64-linux.default = self.packages.x86_64-linux.nix-dissector; + packages.x86_64-linux.snoop-nix-daemon = import ./default.nix { inherit (nixpkgs.legacyPackages.x86_64-linux) pkgs; }; + packages.x86_64-linux.default = self.packages.x86_64-linux.snoop-nix-daemon; }; }