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

network-manager: multiple outputs

Browse Source
This commit is contained in:
Thomas Tuegel 2016-04-24 19:17:55 -05:00
parent 70936ce3f8
commit c25907d072
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/networking/networkmanager.nix
View File

@ -114,7 +114,7 @@ in {
# Ugly hack for using the correct gnome3 packageSet # Ugly hack for using the correct gnome3 packageSet
basePackages = mkOption { basePackages = mkOption {
type = types.attrsOf types.package; type = types.attrsOf types.package;
default = { inherit networkmanager modemmanager wpa_supplicant default = { inherit networkmanager.out modemmanager wpa_supplicant
networkmanager_openvpn networkmanager_vpnc networkmanager_openvpn networkmanager_vpnc
networkmanager_openconnect networkmanager_openconnect
networkmanager_pptp networkmanager_l2tp; }; networkmanager_pptp networkmanager_l2tp; };

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

@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "17jan0g5jzp8mrpklyacwdgnnw016m1c5pc4az5im6qhc260yirs"; sha256 = "17jan0g5jzp8mrpklyacwdgnnw016m1c5pc4az5im6qhc260yirs";
}; };
outputs = [ "dev" "out" ];
preConfigure = '' preConfigure = ''
substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname
substituteInPlace configure --replace /usr/bin/file ${file}/bin/file substituteInPlace configure --replace /usr/bin/file ${file}/bin/file