|
|
|
@ -1,7 +1,22 @@ |
|
|
|
|
{ lib, stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkg-config |
|
|
|
|
{ stdenv |
|
|
|
|
, lib |
|
|
|
|
, substituteAll |
|
|
|
|
, fetchFromGitHub |
|
|
|
|
, autoreconfHook |
|
|
|
|
, libtool |
|
|
|
|
, intltool |
|
|
|
|
, pkg-config |
|
|
|
|
, file |
|
|
|
|
, gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret |
|
|
|
|
, withGnome ? true, libnma, glib }: |
|
|
|
|
, gtk3 |
|
|
|
|
, networkmanager |
|
|
|
|
, ppp |
|
|
|
|
, xl2tpd |
|
|
|
|
, strongswan |
|
|
|
|
, libsecret |
|
|
|
|
, withGnome ? true |
|
|
|
|
, libnma |
|
|
|
|
, glib |
|
|
|
|
}: |
|
|
|
|
|
|
|
|
|
stdenv.mkDerivation rec { |
|
|
|
|
name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; |
|
|
|
@ -22,14 +37,23 @@ stdenv.mkDerivation rec { |
|
|
|
|
}) |
|
|
|
|
]; |
|
|
|
|
|
|
|
|
|
buildInputs = [ networkmanager ppp glib ] |
|
|
|
|
++ lib.optionals withGnome [ gtk3 libsecret libnma ]; |
|
|
|
|
|
|
|
|
|
nativeBuildInputs = [ autoreconfHook libtool intltool pkg-config file ]; |
|
|
|
|
nativeBuildInputs = [ |
|
|
|
|
autoreconfHook |
|
|
|
|
libtool |
|
|
|
|
intltool |
|
|
|
|
pkg-config |
|
|
|
|
file |
|
|
|
|
]; |
|
|
|
|
|
|
|
|
|
preConfigure = '' |
|
|
|
|
intltoolize -f |
|
|
|
|
''; |
|
|
|
|
buildInputs = [ |
|
|
|
|
networkmanager |
|
|
|
|
ppp |
|
|
|
|
glib |
|
|
|
|
] ++ lib.optionals withGnome [ |
|
|
|
|
gtk3 |
|
|
|
|
libsecret |
|
|
|
|
libnma |
|
|
|
|
]; |
|
|
|
|
|
|
|
|
|
configureFlags = [ |
|
|
|
|
"--without-libnm-glib" |
|
|
|
@ -41,6 +65,10 @@ stdenv.mkDerivation rec { |
|
|
|
|
|
|
|
|
|
enableParallelBuilding = true; |
|
|
|
|
|
|
|
|
|
preConfigure = '' |
|
|
|
|
intltoolize -f |
|
|
|
|
''; |
|
|
|
|
|
|
|
|
|
passthru = { |
|
|
|
|
networkManagerPlugin = "VPN/nm-l2tp-service.name"; |
|
|
|
|
}; |
|
|
|
|