diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-09-24 21:18:23 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-09-24 21:18:23 +0200 |
| commit | 3a09a4b579612828277fa4b2c0e7cf84c16b3edf (patch) | |
| tree | 26cc5cc6fda1a3bd83045c590ae04e95847c86a0 /pkgs/tools/networking | |
| parent | cc2f6c866f1013cd0cf620f199bcdba0d8e2fbc2 (diff) | |
| parent | f9197b9f63da8b6d9244c5a8e99507fdd294dcc5 (diff) | |
| download | nixlib-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.tar nixlib-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.tar.gz nixlib-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.tar.bz2 nixlib-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.tar.lz nixlib-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.tar.xz nixlib-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.tar.zst nixlib-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.zip | |
Merge branch 'master' into staging
Hydra: ?compare=1480463
Diffstat (limited to 'pkgs/tools/networking')
6 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index 16964e4db945..facf1b6a6670 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -28,6 +28,7 @@ in stdenv.mkDerivation rec { "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/tmp" + "--enable-absolute-paths" ]; passthru = { diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix index a6fd3e7303df..ad58dc97b0a6 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -31,6 +31,7 @@ in stdenv.mkDerivation rec { "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/" # needed for the management socket under /run/NetworkManager + "--enable-absolute-paths" ]; passthru = { diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix index 3cac1b5e63cf..b44933f7f5f8 100644 --- a/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/var" "--sysconfdir=$(out)/etc" + "--enable-absolute-paths" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix index 23d4c816a20d..0c02569aa27a 100644 --- a/pkgs/tools/networking/network-manager/openconnect/default.nix +++ b/pkgs/tools/networking/network-manager/openconnect/default.nix @@ -26,6 +26,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-gnome=${if withGnome then "yes" else "no"}" + "--enable-absolute-paths" ]; passthru = { diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 0d3a4174744f..66a306ffb66c 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -28,6 +28,7 @@ in stdenv.mkDerivation rec { "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/" # needed for the management socket under /run/NetworkManager + "--enable-absolute-paths" ]; passthru = { diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix index ef45defb7d5a..5d77be86dffe 100644 --- a/pkgs/tools/networking/network-manager/vpnc/default.nix +++ b/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -26,6 +26,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" + "--enable-absolute-paths" ]; passthru = { |