diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-31 08:13:49 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-11-03 10:50:04 -0500 |
| commit | e88fb2dca24d8cb09dd8db12a3c7cec3f74365db (patch) | |
| tree | f9dec79c86895f2ca0d5ca4908d2c461f81494f4 /pkgs/tools/networking/network-manager | |
| parent | 9d59d57d4504655a2b71a5fcf769978492525a43 (diff) | |
| download | nixlib-e88fb2dca24d8cb09dd8db12a3c7cec3f74365db.tar nixlib-e88fb2dca24d8cb09dd8db12a3c7cec3f74365db.tar.gz nixlib-e88fb2dca24d8cb09dd8db12a3c7cec3f74365db.tar.bz2 nixlib-e88fb2dca24d8cb09dd8db12a3c7cec3f74365db.tar.lz nixlib-e88fb2dca24d8cb09dd8db12a3c7cec3f74365db.tar.xz nixlib-e88fb2dca24d8cb09dd8db12a3c7cec3f74365db.tar.zst nixlib-e88fb2dca24d8cb09dd8db12a3c7cec3f74365db.zip | |
networkmanager: fix PPPD_PATH
Fixes #72330 Upstream MR: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/323
Diffstat (limited to 'pkgs/tools/networking/network-manager')
| -rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index e18b5970370f..b03a47e8ce2c 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 = [ |