b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

openvpn: use update-systemd-resolved instead of vendoring it

Browse source
This commit is contained in:
Peter Hoeg 2022-04-08 11:36:39 +08:00
parent adbf08f9ec
commit 7aa2c5cfb4
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,26 +1,21 @@
{ lib, stdenv { lib
, stdenv
, fetchurl , fetchurl
, pkg-config , pkg-config
, makeWrapper
, runtimeShell
, iproute2 , iproute2
, lzo , lzo
, openssl , openssl
, pam , pam
, useSystemd ? stdenv.isLinux , useSystemd ? stdenv.isLinux
, systemd , systemd
, update-systemd-resolved
, util-linux , util-linux
, pkcs11Support ? false , pkcs11Support ? false
, pkcs11helper , pkcs11helper
}: }:
with lib;
let let
# Check if the script needs to have other binaries wrapped when changing this. inherit (lib) versionOlder optional optionals optionalString;
update-resolved = fetchurl {
url = "https://raw.githubusercontent.com/jonathanio/update-systemd-resolved/v1.3.0/update-systemd-resolved";
sha256 = "021qzv1k0zxgv1rmyfpqj3zlzqr28xa7zff1n7vrbjk36ijylpsc";
};
generic = { version, sha256 }: generic = { version, sha256 }:
let let
@ -36,7 +31,7 @@ let
inherit sha256; inherit sha256;
}; };
nativeBuildInputs = [ makeWrapper pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ lzo openssl ] buildInputs = [ lzo openssl ]
++ optional stdenv.isLinux pam ++ optional stdenv.isLinux pam
@ -52,15 +47,15 @@ let
++ optional pkcs11Support "--enable-pkcs11" ++ optional pkcs11Support "--enable-pkcs11"
++ optional stdenv.isDarwin "--disable-plugin-auth-pam"; ++ optional stdenv.isDarwin "--disable-plugin-auth-pam";
# We used to vendor the update-systemd-resolved script inside libexec,
# but a separate package was made, that uses libexec/openvpn. Copy it
# into libexec in case any consumers expect it to be there even though
# they should use the update-systemd-resolved package instead.
postInstall = '' postInstall = ''
mkdir -p $out/share/doc/openvpn/examples mkdir -p $out/share/doc/openvpn/examples
cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples cp -r sample/sample-{config-files,keys,scripts}/ $out/share/doc/openvpn/examples
cp -r sample/sample-keys/ $out/share/doc/openvpn/examples
cp -r sample/sample-scripts/ $out/share/doc/openvpn/examples
'' + optionalString useSystemd '' '' + optionalString useSystemd ''
install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved install -Dm555 -t $out/libexec ${update-systemd-resolved}/libexec/openvpn/*
wrapProgram $out/libexec/update-systemd-resolved \
--prefix PATH : ${makeBinPath [ runtimeShell iproute2 systemd util-linux ]}
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
@ -69,7 +64,7 @@ let
description = "A robust and highly flexible tunneling application"; description = "A robust and highly flexible tunneling application";
downloadPage = "https://openvpn.net/community-downloads/"; downloadPage = "https://openvpn.net/community-downloads/";
homepage = "https://openvpn.net/"; homepage = "https://openvpn.net/";
license = licenses.gpl2; license = licenses.gpl2Only;
maintainers = with maintainers; [ viric peterhoeg ]; maintainers = with maintainers; [ viric peterhoeg ];
platforms = platforms.unix; platforms = platforms.unix;
}; };