nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnome.networkmanager-openconnect: 1.2.6 → 1.2.8

Browse Source 
https://gitlab.gnome.org/GNOME/NetworkManager-openconnect/-/compare/1.2.6...1.2.8
This commit is contained in:
Jan Tojnar 2022-03-15 20:30:05 +00:00
parent 6699fb04e9
commit 1947aeb168
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/tools/networking/networkmanager/openconnect/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv
{ stdenv
, lib
, fetchurl
, substituteAll
, glib
@ -12,21 +13,21 @@
, libsecret
, file
, gtk3
, libnma
, libnma-gtk4
, gtk4
, withGnome ? true
, gnome
, kmod
, fetchpatch
}:
let
stdenv.mkDerivation rec {
pname = "NetworkManager-openconnect";
version = "1.2.6";
in stdenv.mkDerivation {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
version = "1.2.8";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0nlp290nkawc4wqm978n4vhzg3xdqi8kpjjx19l855vab41rh44m";
url = "mirror://gnome/sources/NetworkManager-openconnect/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "Xe2qeF2C2OI53dCCv6xSUMaR6WRGS+GAe2gnJjYzzcw=";
};
patches = [
@ -34,12 +35,6 @@ in stdenv.mkDerivation {
src = ./fix-paths.patch;
inherit kmod openconnect;
})
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/NetworkManager-openconnect/merge_requests/9.patch";
sha256 = "0yd2dmq6gq6y4czr7dqdgaiqvw2vyv2gikznpfdxyfn2v1pcrk9m";
})
];
buildInputs = [
@ -49,6 +44,9 @@ in stdenv.mkDerivation {
networkmanager
] ++ lib.optionals withGnome [
gtk3
libnma
libnma-gtk4
gtk4
gcr
libsecret
];
@ -61,8 +59,8 @@ in stdenv.mkDerivation {
configureFlags = [
"--with-gnome=${if withGnome then "yes" else "no"}"
"--with-gtk4=${if withGnome then "yes" else "no"}"
"--enable-absolute-paths"
"--without-libnm-glib"
];
passthru = {