From e8393131571241c4ab0e2dde912168239cf06175 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 31 Oct 2019 08:17:41 -0400 Subject: [PATCH] networkmanager: fix PPPD_PATH Fixes #72330 for 19.09. Upstream MR: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/323 Fix on master: https://github.com/NixOS/nixpkgs/pull/72362 --- pkgs/tools/networking/network-manager/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 905160cdefcb7d..fdc8dd36ba91fb 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, intltool, pkgconfig, dbus, dbus-glib +{ stdenv, fetchurl, substituteAll, intltool, pkgconfig, fetchpatch, dbus, dbus-glib , gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala , libgcrypt, dnsmasq, bluez5, readline, libselinux, audit , gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup @@ -62,6 +62,13 @@ in stdenv.mkDerivation rec { # Meson does not support using different directories during build and # for installation like Autotools did with flags passed to make install. ./fix-install-paths.patch + + # Fixes https://github.com/NixOS/nixpkgs/issues/72330 + # Upstream MR: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/323 + (fetchpatch { + url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/ed03fcbd17a7f73faad2adf7bf21ae77ad93740d.patch"; + sha256 = "1vv9c1i499900kjnisirby3jz9b99nwcm87r9x20xp4p73zpq2ry"; + }) ]; buildInputs = [