From e88fb2dca24d8cb09dd8db12a3c7cec3f74365db Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 31 Oct 2019 08:13:49 -0400 Subject: networkmanager: fix PPPD_PATH Fixes #72330 Upstream MR: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/323 --- pkgs/tools/networking/network-manager/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index e18b5970370..b03a47e8ce2 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -61,6 +61,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/4c11364201c094ad19ab9980ea6051a82bd2a550.patch"; + sha256 = "14dgb6ijxyzcglrk67is2fn49iwrhljf2sld8w557i6zkypilmsv"; + }) ]; buildInputs = [ -- cgit 1.4.1 From d1d380729b3f498545c8f9f43117e995b5ae2494 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 31 Oct 2019 11:29:14 -0400 Subject: networkmanager: add worldofpeace to maintainers --- pkgs/tools/networking/network-manager/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index b03a47e8ce2..4805d01dead 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -111,7 +111,7 @@ in stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/NetworkManager; description = "Network configuration and management tool"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ phreedom domenkozar obadz ]; + maintainers = with maintainers; [ phreedom domenkozar obadz worldofpeace ]; platforms = platforms.linux; }; } -- cgit 1.4.1