From 6ebe027401b59bdac0581810366153b6dd86d260 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 1 Mar 2026 21:22:48 +0300 Subject: [PATCH] nix: include contrib dir in packaging Signed-off-by: NotAShelf Change-Id: Ie19e1d0f147dd98d15f71adc16ca691f6a6a6964 --- nix/package.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/nix/package.nix b/nix/package.nix index 7e790fa..adb4195 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -1,6 +1,8 @@ { lib, craneLib, + pkg-config, + openssl, }: let pname = "eris"; inherit ((lib.importTOML ../Cargo.toml).package) version; @@ -18,9 +20,12 @@ }; cargoArtifacts = craneLib.buildDepsOnly { - name = "${pname}-deps"; - strictDeps = true; + name = "eris"; inherit src; + + strictDeps = true; + nativeBuildInputs = [pkg-config]; + buildInputs = [openssl]; }; in craneLib.buildPackage { @@ -28,11 +33,13 @@ in strictDeps = true; - postInstall = '' - mkdir -p $out/share/contrib - cp -rv $src/contrib/corpus $out/share/contrib - cp -rv $src/contrib/lua $out/share/contrib - ''; + # FIXME: better provide those via wrappers... + # postFixup = '' + # mkdir -p "$out"/share/contrib/{corpus,lua} + # + # install -Dm755 ${../contrib/corpus}/*.txt $out/share/contrib/corpus + # install -Dm755 ${../contrib/lua}/*.lua $out/share/contrib/lua + # ''; meta = { description = "Sophisticated HTTP tarpit and honeypot stream";