diff options
| author | Matt McHenry <github@matt.mchenryfamily.org> | 2021-05-10 20:50:59 -0400 |
|---|---|---|
| committer | Matt McHenry <github@matt.mchenryfamily.org> | 2021-06-02 19:22:13 -0400 |
| commit | 12368c04d121186b32c15b442748710e9a43af59 (patch) | |
| tree | d4829a66983493038d6f4f37996c1bcfb38667e2 /pkgs/tools/networking/vpnc-scripts/default.nix | |
| parent | e2b7cfedd6cf29db095dd469e4453c9138c87d1f (diff) | |
| download | nixpkgs-12368c04d121186b32c15b442748710e9a43af59.tar nixpkgs-12368c04d121186b32c15b442748710e9a43af59.tar.gz nixpkgs-12368c04d121186b32c15b442748710e9a43af59.tar.bz2 nixpkgs-12368c04d121186b32c15b442748710e9a43af59.tar.lz nixpkgs-12368c04d121186b32c15b442748710e9a43af59.tar.xz nixpkgs-12368c04d121186b32c15b442748710e9a43af59.tar.zst nixpkgs-12368c04d121186b32c15b442748710e9a43af59.zip | |
vpnc-scripts: 2020-02-21 -> 2021-03-21
adds resolvectl support; as suggested by @liff
Diffstat (limited to 'pkgs/tools/networking/vpnc-scripts/default.nix')
| -rw-r--r-- | pkgs/tools/networking/vpnc-scripts/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/tools/networking/vpnc-scripts/default.nix b/pkgs/tools/networking/vpnc-scripts/default.nix index 03abd48ad9d..734c6d9f4ec 100644 --- a/pkgs/tools/networking/vpnc-scripts/default.nix +++ b/pkgs/tools/networking/vpnc-scripts/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchgit , makeWrapper -, nettools, gawk, openresolv, coreutils, gnugrep +, nettools, gawk, systemd, openresolv, coreutils, gnugrep }: stdenv.mkDerivation { pname = "vpnc-scripts"; - version = "unstable-2020-02-21"; + version = "unstable-2021-03-21"; src = fetchgit { url = "git://git.infradead.org/users/dwmw2/vpnc-scripts.git"; - rev = "c0122e891f7e033f35f047dad963702199d5cb9e"; - sha256 = "11b1ls012mb704jphqxjmqrfbbhkdjb64j2q4k8wb5jmja8jnd14"; + rev = "8fff06090ed193c4a7285e9a10b42e6679e8ecf3"; + sha256 = "14bzzpwz7kdmlbx825h6s4jjdml9q6ziyrq8311lp8caql68qdq1"; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,7 +24,8 @@ stdenv.mkDerivation { --replace "which" "type -P" '' + lib.optionalString stdenv.isLinux '' substituteInPlace $out/bin/vpnc-script \ - --replace "/sbin/resolvconf" "${openresolv}/bin/resolvconf" + --replace "/sbin/resolvconf" "${openresolv}/bin/resolvconf" \ + --replace "/usr/bin/resolvectl" "${systemd}/bin/resolvectl" '' + '' wrapProgram $out/bin/vpnc-script \ --prefix PATH : "${lib.makeBinPath ([ nettools gawk coreutils gnugrep ] ++ lib.optionals stdenv.isLinux [ openresolv ])}" |