diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-11-05 19:22:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-05 19:22:00 +0000 |
| commit | e6393df3de207a7e8bb4a2074895d9c96f99ff7b (patch) | |
| tree | 2b81f6b88c56d6c872ca5e52952b9dc4066e1963 | |
| parent | 95ba61b1b06af67668345e20f6c941b0539465aa (diff) | |
| parent | d1d380729b3f498545c8f9f43117e995b5ae2494 (diff) | |
| download | nixpkgs-e6393df3de207a7e8bb4a2074895d9c96f99ff7b.tar nixpkgs-e6393df3de207a7e8bb4a2074895d9c96f99ff7b.tar.gz nixpkgs-e6393df3de207a7e8bb4a2074895d9c96f99ff7b.tar.bz2 nixpkgs-e6393df3de207a7e8bb4a2074895d9c96f99ff7b.tar.lz nixpkgs-e6393df3de207a7e8bb4a2074895d9c96f99ff7b.tar.xz nixpkgs-e6393df3de207a7e8bb4a2074895d9c96f99ff7b.tar.zst nixpkgs-e6393df3de207a7e8bb4a2074895d9c96f99ff7b.zip | |
Merge pull request #72362 from worldofpeace/nm-fix-pppd-path
networkmanager: fix PPPD_PATH
| -rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index e18b5970370..4805d01dead 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 = [ @@ -104,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; }; } |