networkmanager-openconnect: format with nixpkgs-fmt

This commit is contained in:
Jan Tojnar 2019-11-10 02:09:20 +01:00
parent 488e6b7a23
commit 33f664ceee
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4

View File

@ -1,14 +1,29 @@
{ stdenv, fetchurl, substituteAll, openconnect, intltool, pkgconfig, autoreconfHook, networkmanager, gcr, libsecret, file { stdenv
, gtk3, withGnome ? true, gnome3, kmod, fetchpatch }: , fetchurl
, substituteAll
, openconnect
, intltool
, pkgconfig
, autoreconfHook
, networkmanager
, gcr
, libsecret
, file
, gtk3
, withGnome ? true
, gnome3
, kmod
, fetchpatch
}:
let let
pname = "NetworkManager-openconnect"; pname = "NetworkManager-openconnect";
version = "1.2.6"; version = "1.2.6";
in stdenv.mkDerivation { in stdenv.mkDerivation {
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 = "0nlp290nkawc4wqm978n4vhzg3xdqi8kpjjx19l855vab41rh44m"; sha256 = "0nlp290nkawc4wqm978n4vhzg3xdqi8kpjjx19l855vab41rh44m";
}; };
@ -17,6 +32,7 @@ in stdenv.mkDerivation {
src = ./fix-paths.patch; src = ./fix-paths.patch;
inherit kmod openconnect; inherit kmod openconnect;
}) })
# Don't use etc/dbus-1/system.d # Don't use etc/dbus-1/system.d
(fetchpatch { (fetchpatch {
url = "https://gitlab.gnome.org/GNOME/NetworkManager-openconnect/merge_requests/9.patch"; url = "https://gitlab.gnome.org/GNOME/NetworkManager-openconnect/merge_requests/9.patch";
@ -24,10 +40,20 @@ in stdenv.mkDerivation {
}) })
]; ];
buildInputs = [ openconnect networkmanager ] buildInputs = [
++ stdenv.lib.optionals withGnome [ gtk3 gcr libsecret ]; openconnect
networkmanager
] ++ stdenv.lib.optionals withGnome [
gtk3
gcr
libsecret
];
nativeBuildInputs = [ intltool pkgconfig file ]; nativeBuildInputs = [
intltool
pkgconfig
file
];
configureFlags = [ configureFlags = [
"--with-gnome=${if withGnome then "yes" else "no"}" "--with-gnome=${if withGnome then "yes" else "no"}"
@ -43,7 +69,7 @@ in stdenv.mkDerivation {
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "NetworkManager's OpenConnect plugin"; description = "NetworkManagers OpenConnect plugin";
inherit (networkmanager.meta) maintainers platforms; inherit (networkmanager.meta) maintainers platforms;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
}; };