diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-06-10 15:19:13 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-06-10 15:31:04 +0200 |
commit | dc318b393feb004890c18a6683fe66af25a54ad2 (patch) | |
tree | 7d54ecf05ceb2c000b8aeed00ed6789995b4e9c9 /pkgs/tools/networking | |
parent | a421af29e46854fd1327585e269e60d510300024 (diff) | |
download | nixpkgs-dc318b393feb004890c18a6683fe66af25a54ad2.tar nixpkgs-dc318b393feb004890c18a6683fe66af25a54ad2.tar.gz nixpkgs-dc318b393feb004890c18a6683fe66af25a54ad2.tar.bz2 nixpkgs-dc318b393feb004890c18a6683fe66af25a54ad2.tar.lz nixpkgs-dc318b393feb004890c18a6683fe66af25a54ad2.tar.xz nixpkgs-dc318b393feb004890c18a6683fe66af25a54ad2.tar.zst nixpkgs-dc318b393feb004890c18a6683fe66af25a54ad2.zip |
networkmanager-fortisslvpn: clean up
* format with nixpkgs-fmt * reorder the expression * move pname into the main attrset * use pkg-config instead of pkgconfig alias
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/network-manager/fortisslvpn/default.nix | 50 |
1 files changed, 38 insertions, 12 deletions
diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index 0ce50a3b2d4..c0bb2a4276b 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -1,10 +1,23 @@ -{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, file, gtk3, -networkmanager, ppp, libsecret, withGnome ? true, gnome3, fetchpatch, libnma }: +{ stdenv +, fetchurl +, substituteAll +, openfortivpn +, intltool +, pkg-config +, file +, gtk3 +, networkmanager +, ppp +, libsecret +, withGnome ? true +, gnome3 +, fetchpatch +, libnma +}: -let +stdenv.mkDerivation rec { pname = "NetworkManager-fortisslvpn"; version = "1.2.10"; -in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { @@ -17,6 +30,7 @@ in stdenv.mkDerivation { src = ./fix-paths.patch; inherit openfortivpn; }) + # Don't use etc/dbus-1/system.d (fetchpatch { url = "https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/merge_requests/11.patch"; @@ -24,10 +38,21 @@ in stdenv.mkDerivation { }) ]; - buildInputs = [ openfortivpn networkmanager ppp ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; + nativeBuildInputs = [ + intltool + pkg-config + file + ]; - nativeBuildInputs = [ intltool pkgconfig file ]; + buildInputs = [ + openfortivpn + networkmanager + ppp + ] ++ stdenv.lib.optionals withGnome [ + gtk3 + libsecret + libnma + ]; configureFlags = [ "--without-libnm-glib" @@ -36,9 +61,11 @@ in stdenv.mkDerivation { "--enable-absolute-paths" ]; - # the installer only create an empty directory in localstatedir, so - # we can drop it - installFlags = [ "localstatedir=." ]; + installFlags = [ + # the installer only creates an empty directory in localstatedir, so + # we can drop it + "localstatedir=." + ]; passthru = { updateScript = gnome3.updateScript { @@ -48,9 +75,8 @@ in stdenv.mkDerivation { }; meta = with stdenv.lib; { - description = "NetworkManager's FortiSSL plugin"; + description = "NetworkManager’s FortiSSL plugin"; inherit (networkmanager.meta) maintainers platforms; license = licenses.gpl2; }; } - |