diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-09 15:52:38 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-08-09 17:37:10 +0200 |
commit | 11b4c9cb8ebe0245c1de1743cf851e7d0eb2eba5 (patch) | |
tree | dbc690ac0989468c3b18104ed0a3c4786b46f898 /pkgs/tools/networking | |
parent | d2f75c32de78efb5be439e9826be6447efe0166d (diff) | |
download | nixlib-11b4c9cb8ebe0245c1de1743cf851e7d0eb2eba5.tar nixlib-11b4c9cb8ebe0245c1de1743cf851e7d0eb2eba5.tar.gz nixlib-11b4c9cb8ebe0245c1de1743cf851e7d0eb2eba5.tar.bz2 nixlib-11b4c9cb8ebe0245c1de1743cf851e7d0eb2eba5.tar.lz nixlib-11b4c9cb8ebe0245c1de1743cf851e7d0eb2eba5.tar.xz nixlib-11b4c9cb8ebe0245c1de1743cf851e7d0eb2eba5.tar.zst nixlib-11b4c9cb8ebe0245c1de1743cf851e7d0eb2eba5.zip |
networkmanager-openvpn: cleanup
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/network-manager/openvpn/default.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 28b7c873d364..8d3bd874718c 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -2,13 +2,13 @@ , withGnome ? true, gnome3, kmod }: let - pname = "NetworkManager-openvpn"; + pname = "NetworkManager-openvpn"; version = "1.8.4"; in stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0gyrv46h9k17qym48qacq4zpxbap6hi17shn921824zm98m2bdvr"; }; @@ -19,15 +19,13 @@ in stdenv.mkDerivation rec { }) ]; - buildInputs = [ openvpn networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring - gnome3.networkmanagerapplet ]; + buildInputs = [ openvpn networkmanager ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig libxml2 ]; configureFlags = [ - "${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}" - "--disable-static" + "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/" # needed for the management socket under /run/NetworkManager ]; @@ -38,8 +36,9 @@ in stdenv.mkDerivation rec { }; }; - meta = { + meta = with stdenv.lib; { description = "NetworkManager's OpenVPN plugin"; inherit (networkmanager.meta) maintainers platforms; + license = licenses.gpl2Plus; }; } |