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

Merge commit 'refs/pull/14242/head' of git://github.com/NixOS/nixpkgs

This commit is contained in:
Nikolay Amiantov 2016-04-07 03:00:36 +03:00
parent 61929cf6f5 8857774f91
commit 5330244958
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
, udev, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables , udev, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline , libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline
, gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
, ethtool, gnused }: , ethtool, gnused, coreutils, file, inetutils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "network-manager-${version}"; name = "network-manager-${version}";
@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
}; };
preConfigure = '' preConfigure = ''
substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname
substituteInPlace configure --replace /usr/bin/file ${file}/bin/file
substituteInPlace src/devices/nm-device.c --replace /usr/bin/ping ${inetutils}/bin/ping
substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe
substituteInPlace data/85-nm-unmanaged.rules \ substituteInPlace data/85-nm-unmanaged.rules \
--replace /bin/sh ${stdenv.shell} \ --replace /bin/sh ${stdenv.shell} \