Merge pull request #68764 from dtzWill/update/networkmanager-openconnect-1.2.6

networkmanager-openconnect: 1.2.4 -> 1.2.6
This commit is contained in:
obadz 2019-09-14 15:08:00 +01:00 committed by GitHub
commit 1a848ef93a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,15 +1,15 @@
{ stdenv, fetchurl, substituteAll, openconnect, intltool, pkgconfig, networkmanager, libsecret
{ stdenv, fetchurl, substituteAll, openconnect, intltool, pkgconfig, autoreconfHook, networkmanager, gcr, libsecret, file
, gtk3, withGnome ? true, gnome3, kmod }:
let
pname = "NetworkManager-openconnect";
version = "1.2.4";
version = "1.2.6";
in stdenv.mkDerivation {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "15j98wwspv6mcmy91w30as5qc1bzsnhlk060xhjy4qrvd37y0xx1";
sha256 = "0nlp290nkawc4wqm978n4vhzg3xdqi8kpjjx19l855vab41rh44m";
};
patches = [
@ -20,13 +20,14 @@ in stdenv.mkDerivation {
];
buildInputs = [ openconnect networkmanager ]
++ stdenv.lib.optionals withGnome [ gtk3 libsecret ];
++ stdenv.lib.optionals withGnome [ gtk3 gcr libsecret ];
nativeBuildInputs = [ intltool pkgconfig ];
nativeBuildInputs = [ intltool pkgconfig file ];
configureFlags = [
"--with-gnome=${if withGnome then "yes" else "no"}"
"--enable-absolute-paths"
"--without-libnm-glib"
];
passthru = {