diff options
author | Peter Hoeg <peter@hoeg.com> | 2022-04-08 11:36:39 +0800 |
---|---|---|
committer | Peter Hoeg <peter@hoeg.com> | 2022-04-12 22:59:11 +0800 |
commit | 7aa2c5cfb4c771302c4bcd2f38d0590952bf93df (patch) | |
tree | 893b9bd88cba3ccf80476c5d7e90e08a59380d10 /pkgs/tools/networking | |
parent | adbf08f9ec3247e43e444c57bac01b52dd648ac6 (diff) | |
download | nixlib-7aa2c5cfb4c771302c4bcd2f38d0590952bf93df.tar nixlib-7aa2c5cfb4c771302c4bcd2f38d0590952bf93df.tar.gz nixlib-7aa2c5cfb4c771302c4bcd2f38d0590952bf93df.tar.bz2 nixlib-7aa2c5cfb4c771302c4bcd2f38d0590952bf93df.tar.lz nixlib-7aa2c5cfb4c771302c4bcd2f38d0590952bf93df.tar.xz nixlib-7aa2c5cfb4c771302c4bcd2f38d0590952bf93df.tar.zst nixlib-7aa2c5cfb4c771302c4bcd2f38d0590952bf93df.zip |
openvpn: use update-systemd-resolved instead of vendoring it
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/openvpn/default.nix | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 9200bc3f30e8..71a14b169ac1 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -1,26 +1,21 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , pkg-config -, makeWrapper -, runtimeShell , iproute2 , lzo , openssl , pam , useSystemd ? stdenv.isLinux , systemd +, update-systemd-resolved , util-linux , pkcs11Support ? false , pkcs11helper }: -with lib; let - # Check if the script needs to have other binaries wrapped when changing this. - update-resolved = fetchurl { - url = "https://raw.githubusercontent.com/jonathanio/update-systemd-resolved/v1.3.0/update-systemd-resolved"; - sha256 = "021qzv1k0zxgv1rmyfpqj3zlzqr28xa7zff1n7vrbjk36ijylpsc"; - }; + inherit (lib) versionOlder optional optionals optionalString; generic = { version, sha256 }: let @@ -36,7 +31,7 @@ let inherit sha256; }; - nativeBuildInputs = [ makeWrapper pkg-config ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lzo openssl ] ++ optional stdenv.isLinux pam @@ -52,15 +47,15 @@ let ++ optional pkcs11Support "--enable-pkcs11" ++ 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 = '' mkdir -p $out/share/doc/openvpn/examples - cp -r sample/sample-config-files/ $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 + cp -r sample/sample-{config-files,keys,scripts}/ $out/share/doc/openvpn/examples '' + optionalString useSystemd '' - install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved - wrapProgram $out/libexec/update-systemd-resolved \ - --prefix PATH : ${makeBinPath [ runtimeShell iproute2 systemd util-linux ]} + install -Dm555 -t $out/libexec ${update-systemd-resolved}/libexec/openvpn/* ''; enableParallelBuilding = true; @@ -69,7 +64,7 @@ let description = "A robust and highly flexible tunneling application"; downloadPage = "https://openvpn.net/community-downloads/"; homepage = "https://openvpn.net/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ viric peterhoeg ]; platforms = platforms.unix; }; |