From e9d6223ec5dba5c651daee589af29cdf133bbcd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 9 Dec 2025 08:31:04 -0800 Subject: [PATCH 1/3] libnet: move library to $out --- pkgs/by-name/li/libnet/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libnet/package.nix b/pkgs/by-name/li/libnet/package.nix index c6d9ba2a8929..a152d0823744 100644 --- a/pkgs/by-name/li/libnet/package.nix +++ b/pkgs/by-name/li/libnet/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { outputs = [ "out" - "lib" + "dev" ]; nativeBuildInputs = [ @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; + preFixup = '' + moveToOutput bin/libnet-config "$dev" + ''; + meta = with lib; { homepage = "https://github.com/sam-github/libnet"; description = "Portable framework for low-level network packet construction"; From 3d6f8e280110a2dd166991135827991c9f97a3d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 9 Dec 2025 09:57:04 -0800 Subject: [PATCH 2/3] sslsplit: make LIB*_BASE point to dev output --- pkgs/by-name/ss/sslsplit/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ss/sslsplit/package.nix b/pkgs/by-name/ss/sslsplit/package.nix index 73ba386ae1cb..96101e75313e 100644 --- a/pkgs/by-name/ss/sslsplit/package.nix +++ b/pkgs/by-name/ss/sslsplit/package.nix @@ -39,10 +39,10 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" - "OPENSSL_BASE=${openssl.dev}" - "LIBEVENT_BASE=${libevent.dev}" - "LIBPCAP_BASE=${libpcap}" - "LIBNET_BASE=${libnet}" + "OPENSSL_BASE=${lib.getDev openssl}" + "LIBEVENT_BASE=${lib.getDev libevent}" + "LIBPCAP_BASE=${lib.getDev libpcap}" + "LIBNET_BASE=${lib.getDev libnet}" ]; meta = with lib; { From c5574ef623671109c45320ded800d72498620e5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 9 Dec 2025 10:00:03 -0800 Subject: [PATCH 3/3] yersinia: get include dirs from dev outputs --- pkgs/by-name/ye/yersinia/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ye/yersinia/package.nix b/pkgs/by-name/ye/yersinia/package.nix index e2717c3c6fcc..f808289008c9 100644 --- a/pkgs/by-name/ye/yersinia/package.nix +++ b/pkgs/by-name/ye/yersinia/package.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation { autoreconfPhase = "./autogen.sh"; configureFlags = [ - "--with-pcap-includes=${libpcap}/include" - "--with-libnet-includes=${libnet}/include" + "--with-pcap-includes=${lib.getDev libpcap}/include" + "--with-libnet-includes=${lib.getDev libnet}/include" ] ++ lib.optional (!enableAdmin) "--disable-admin" ++ lib.optional (!withGtk) "--disable-gtk";