BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

openvpn: make systemd dependency optional

Browse source 
systemd is a fairly large dependency, and it doesn't appear to
be necessary in all circumstances - e.g. when openvpn is
not run as a systemd service (as is usually the case when it is
run in a Docker container).

This change makes the dependency on systemd optional, controlled
by a new argument `useSystemd`. The default behaviour remains
the same as it was before this change: enabled only on Linux systems.

For me, this change reduces the size of my container image (dominated
by the closure of openvpn) from about 110 MB to 45 MB.

Version 2: rename argument to `useSystemd` (was `systemdSupport`), and
rebase onto master
This commit is contained in:
Kier Davis 2018-01-02 17:28:15 +00:00
parent b067aa2cad
commit 397daef205
No known key found for this signature in database
GPG key ID: 66378DA35FF9F0FA
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/tools/networking/openvpn/default.nix
View file

@ -1,7 +1,9 @@
{ stdenv, fetchurl, iproute, lzo, openssl, pam, systemd, pkgconfig { stdenv, fetchurl, iproute, lzo, openssl, pam, pkgconfig
, useSystemd ? stdenv.isLinux, systemd ? null
, pkcs11Support ? false, pkcs11helper ? null, , pkcs11Support ? false, pkcs11helper ? null,
}: }:
assert useSystemd -> (systemd != null);
assert pkcs11Support -> (pkcs11helper != null); assert pkcs11Support -> (pkcs11helper != null);
with stdenv.lib; with stdenv.lib;
@ -17,13 +19,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ lzo openssl ] buildInputs = [ lzo openssl ]
++ optionals stdenv.isLinux [ pam systemd iproute ] ++ optionals stdenv.isLinux [ pam iproute ]
++ optional useSystemd systemd
++ optional pkcs11Support pkcs11helper; ++ optional pkcs11Support pkcs11helper;
configureFlags = optionals stdenv.isLinux [ configureFlags = optionals stdenv.isLinux [
"--enable-systemd"
"--enable-iproute2" "--enable-iproute2"
"IPROUTE=${iproute}/sbin/ip" ] "IPROUTE=${iproute}/sbin/ip" ]
++ optional useSystemd "--enable-systemd"
++ optional pkcs11Support "--enable-pkcs11" ++ optional pkcs11Support "--enable-pkcs11"
++ optional stdenv.isDarwin "--disable-plugin-auth-pam"; ++ optional stdenv.isDarwin "--disable-plugin-auth-pam";