diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-08-15 10:32:51 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-08-19 17:57:04 +0300 |
| commit | 821e5c95b4f5fbbbb47c838d11cf0c4074df5771 (patch) | |
| tree | d48dc555f631b069c790287138ab06f47bd587bd /pkgs | |
| parent | 1b8806098ac6f87a3d7949e94499c2abf4c67798 (diff) | |
| download | nixpkgs-821e5c95b4f5fbbbb47c838d11cf0c4074df5771.tar nixpkgs-821e5c95b4f5fbbbb47c838d11cf0c4074df5771.tar.gz nixpkgs-821e5c95b4f5fbbbb47c838d11cf0c4074df5771.tar.bz2 nixpkgs-821e5c95b4f5fbbbb47c838d11cf0c4074df5771.tar.lz nixpkgs-821e5c95b4f5fbbbb47c838d11cf0c4074df5771.tar.xz nixpkgs-821e5c95b4f5fbbbb47c838d11cf0c4074df5771.tar.zst nixpkgs-821e5c95b4f5fbbbb47c838d11cf0c4074df5771.zip | |
networkmanager098: fix binary paths
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/network-manager/0.9.8/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/tools/networking/network-manager/0.9.8/default.nix b/pkgs/tools/networking/network-manager/0.9.8/default.nix index 4fad1ca2ab9..0c791631daa 100644 --- a/pkgs/tools/networking/network-manager/0.9.8/default.nix +++ b/pkgs/tools/networking/network-manager/0.9.8/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, intltool, pkgconfig, dbus_glib , udev, libnl, libuuid, gnutls, dhcp -, libgcrypt, perl, libgudev }: +, libgcrypt, perl, libgudev, avahi, ppp, kmod }: stdenv.mkDerivation rec { name = "network-manager-${version}"; @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl + substituteInPlace src/nm-device.c \ + --replace @avahi@ ${avahi} \ + --replace @kmod@ ${kmod} + substituteInPlace src/ppp-manager/nm-ppp-manager.c \ + --replace @ppp@ ${ppp} \ + --replace @kmod@ ${kmod} ''; # Right now we hardcode quite a few paths at build time. Probably we should diff --git a/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch b/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch index 831b2010fcf..9ebc080ba96 100644 --- a/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch +++ b/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch @@ -47,7 +47,7 @@ index 1dc94ee..e60f3c8 100644 for (iter = modules; *iter; iter++) { - char *argv[3] = { "/sbin/modprobe", *iter, NULL }; -+ char *argv[3] = { "/var/run/current-system/sw/bin/modprobe", *iter, NULL }; ++ char *argv[3] = { "@kmod@/bin/modprobe", *iter, NULL }; char *envp[1] = { NULL }; GError *error = NULL; @@ -71,7 +71,7 @@ index 59698c3..7dba0f7 100644 /* Make sure /dev/ppp exists (bgo #533064) */ if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode)) - ignored = system ("/sbin/modprobe ppp_generic"); -+ ignored = system ("/var/run/current-system/sw/bin/modprobe ppp_generic"); ++ ignored = system ("@kmod@/bin/modprobe ppp_generic"); connection = nm_act_request_get_connection (req); g_assert (connection); |