public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #72362 from worldofpeace/nm-fix-pppd-path

Browse Source 
networkmanager: fix PPPD_PATH
This commit is contained in:
worldofpeace 2019-11-05 19:22:00 +00:00 committed by GitHub
commit e6393df3de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/networking/network-manager/default.nix
View File

@ -61,6 +61,13 @@ in stdenv.mkDerivation rec {
# Meson does not support using different directories during build and # Meson does not support using different directories during build and
# for installation like Autotools did with flags passed to make install. # for installation like Autotools did with flags passed to make install.
./fix-install-paths.patch ./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 = [ buildInputs = [
@ -104,7 +111,7 @@ in stdenv.mkDerivation rec {
homepage = https://wiki.gnome.org/Projects/NetworkManager; homepage = https://wiki.gnome.org/Projects/NetworkManager;
description = "Network configuration and management tool"; description = "Network configuration and management tool";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ phreedom domenkozar obadz ]; maintainers = with maintainers; [ phreedom domenkozar obadz worldofpeace ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }