networkmanager-openvpn: cleanup

This commit is contained in:
Jan Tojnar 2018-08-09 15:52:38 +02:00
parent d2f75c32de
commit 11b4c9cb8e
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4

View file

@ -2,13 +2,13 @@
, withGnome ? true, gnome3, kmod }: , withGnome ? true, gnome3, kmod }:
let let
pname = "NetworkManager-openvpn"; pname = "NetworkManager-openvpn";
version = "1.8.4"; version = "1.8.4";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchurl { 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"; sha256 = "0gyrv46h9k17qym48qacq4zpxbap6hi17shn921824zm98m2bdvr";
}; };
@ -19,15 +19,13 @@ in stdenv.mkDerivation rec {
}) })
]; ];
buildInputs = [ openvpn networkmanager libsecret ] buildInputs = [ openvpn networkmanager ]
++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ];
gnome3.networkmanagerapplet ];
nativeBuildInputs = [ intltool pkgconfig libxml2 ]; nativeBuildInputs = [ intltool pkgconfig libxml2 ];
configureFlags = [ configureFlags = [
"${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}" "--with-gnome=${if withGnome then "yes" else "no"}"
"--disable-static"
"--localstatedir=/" # needed for the management socket under /run/NetworkManager "--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"; description = "NetworkManager's OpenVPN plugin";
inherit (networkmanager.meta) maintainers platforms; inherit (networkmanager.meta) maintainers platforms;
license = licenses.gpl2Plus;
}; };
} }