From ef42b9754764aaebd1ac1a6ba7b3ccf3790a582a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 8 May 2023 21:44:42 +0800 Subject: [PATCH] ppp: specify statedir for .pid file --- pkgs/tools/networking/ppp/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 9364d10b117..535545f42bc 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -23,14 +23,16 @@ stdenv.mkDerivation rec { }; configureFlags = [ - "--with-openssl=${openssl.dev}" + "--localstatedir=/var" "--sysconfdir=/etc" + "--with-openssl=${openssl.dev}" ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ libpcap libxcrypt @@ -47,6 +49,8 @@ stdenv.mkDerivation rec { scripts/{pon,poff,plog} ''; + enableParallelBuilding = true; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; @@ -57,11 +61,8 @@ stdenv.mkDerivation rec { "sysconfdir=$(out)/etc" ]; - preInstall = '' - mkdir -p $out/bin - ''; postInstall = '' - install -D -m 755 scripts/{pon,poff,plog} $out/bin + install -Dm755 -t $out/bin scripts/{pon,poff,plog} ''; postFixup = ''