diff options
| author | obadz <3359345+obadz@users.noreply.github.com> | 2019-09-14 15:08:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-14 15:08:00 +0100 |
| commit | 1a848ef93a5f60d747a373264fc69e2d8bfd64df (patch) | |
| tree | 5a05c5276331739699048ec48ec499162b864bf0 /pkgs/tools | |
| parent | 152f1e65778ebf3293c4fd79afdf56227fea8807 (diff) | |
| parent | 6654b52c8b5a885f748eb3541bd5b2defb8cd992 (diff) | |
| download | nixpkgs-1a848ef93a5f60d747a373264fc69e2d8bfd64df.tar nixpkgs-1a848ef93a5f60d747a373264fc69e2d8bfd64df.tar.gz nixpkgs-1a848ef93a5f60d747a373264fc69e2d8bfd64df.tar.bz2 nixpkgs-1a848ef93a5f60d747a373264fc69e2d8bfd64df.tar.lz nixpkgs-1a848ef93a5f60d747a373264fc69e2d8bfd64df.tar.xz nixpkgs-1a848ef93a5f60d747a373264fc69e2d8bfd64df.tar.zst nixpkgs-1a848ef93a5f60d747a373264fc69e2d8bfd64df.zip | |
Merge pull request #68764 from dtzWill/update/networkmanager-openconnect-1.2.6
networkmanager-openconnect: 1.2.4 -> 1.2.6
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/network-manager/openconnect/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix index 1fb50686d0d..4236c9e1818 100644 --- a/pkgs/tools/networking/network-manager/openconnect/default.nix +++ b/pkgs/tools/networking/network-manager/openconnect/default.nix @@ -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 = { |