networkmanager-openvpn: 1.8.10 -> 1.8.12
- libnm-glib is now disabled by default
This commit is contained in:
parent
6629a67331
commit
ad68703e14
@ -1,15 +1,15 @@
|
||||
{ stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret
|
||||
, gtk3, withGnome ? true, gnome3, kmod, fetchpatch, libnma }:
|
||||
, gtk3, withGnome ? true, gnome3, kmod, libnma }:
|
||||
|
||||
let
|
||||
pname = "NetworkManager-openvpn";
|
||||
version = "1.8.10";
|
||||
version = "1.8.12";
|
||||
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 = "1vri49yff4lj13dnzkpq9nx3a4z1bmbrv807r151plj8m1mwhg5g";
|
||||
sha256 = "062kh4zj7jfbwy4zzcwpq2m457bzbpm3l18s0ysnw3mgia3siz8f";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -17,11 +17,6 @@ in stdenv.mkDerivation {
|
||||
src = ./fix-paths.patch;
|
||||
inherit kmod openvpn;
|
||||
})
|
||||
# Don't use etc/dbus-1/system.d
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/NetworkManager-openvpn/merge_requests/13.patch";
|
||||
sha256 = "06cvqi28v72dd53fw8ix95mqj885xhwi8qcs2q7hvm5bvnhwn704";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ openvpn networkmanager ]
|
||||
@ -30,7 +25,6 @@ in stdenv.mkDerivation {
|
||||
nativeBuildInputs = [ intltool pkgconfig file libxml2 ];
|
||||
|
||||
configureFlags = [
|
||||
"--without-libnm-glib"
|
||||
"--with-gnome=${if withGnome then "yes" else "no"}"
|
||||
"--localstatedir=/" # needed for the management socket under /run/NetworkManager
|
||||
"--enable-absolute-paths"
|
||||
|
Loading…
Reference in New Issue
Block a user