diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-08-02 23:44:50 +0400 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-08-02 23:44:50 +0400 |
| commit | 64f932f8fda4fc87a7ee3ce604405c5c775f5926 (patch) | |
| tree | b456585e2667457cea34d3f85730177dbd4c1d26 /pkgs | |
| parent | fd330e9315c84f2ea9598d4fa2e6cc79a39cb1e3 (diff) | |
| download | nixlib-64f932f8fda4fc87a7ee3ce604405c5c775f5926.tar nixlib-64f932f8fda4fc87a7ee3ce604405c5c775f5926.tar.gz nixlib-64f932f8fda4fc87a7ee3ce604405c5c775f5926.tar.bz2 nixlib-64f932f8fda4fc87a7ee3ce604405c5c775f5926.tar.lz nixlib-64f932f8fda4fc87a7ee3ce604405c5c775f5926.tar.xz nixlib-64f932f8fda4fc87a7ee3ce604405c5c775f5926.tar.zst nixlib-64f932f8fda4fc87a7ee3ce604405c5c775f5926.zip | |
NetworkManager-pptp: fix path to pppd and pptp, upgrade
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/network-manager/pptp-purity.patch | 26 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/pptp.nix | 13 |
2 files changed, 36 insertions, 3 deletions
diff --git a/pkgs/tools/networking/network-manager/pptp-purity.patch b/pkgs/tools/networking/network-manager/pptp-purity.patch new file mode 100644 index 000000000000..55ade68dd41c --- /dev/null +++ b/pkgs/tools/networking/network-manager/pptp-purity.patch @@ -0,0 +1,26 @@ +diff --git a/src/nm-pptp-service.c b/src/nm-pptp-service.c +index 68a5759..568bbfe 100644 +--- a/src/nm-pptp-service.c ++++ b/src/nm-pptp-service.c +@@ -729,9 +729,7 @@ nm_find_pppd (void) + { + static const char *pppd_binary_paths[] = + { +- "/sbin/pppd", +- "/usr/sbin/pppd", +- "/usr/local/sbin/pppd", ++ "@ppp@/sbin/pppd", + NULL + }; + +@@ -751,9 +749,7 @@ nm_find_pptp (void) + { + static const char *pptp_binary_paths[] = + { +- "/sbin/pptp", +- "/usr/sbin/pptp", +- "/usr/local/sbin/pptp", ++ "@pptp@/sbin/pptp", + NULL + }; + diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index dc3c1643ebcc..8d2acfe9b316 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig +{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig, substituteAll , withGnome ? false, gtk, libgnome_keyring }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-pptp"; - version = "0.9.2.0"; + version = "0.9.4.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; - sha256 = "1fj2v8pjc17m9calckgc2jm8wbimwga8if4r21walf9xysvhsd1b"; + sha256 = "0p93in5dn8m6dp9qs2ppfmazwqlklp5hwp9pjqr7jwvjbac75dvg"; }; buildInputs = [ networkmanager pptp ppp ] @@ -19,6 +19,13 @@ stdenv.mkDerivation rec { configureFlags = if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"; + patches = + [ ( substituteAll { + src = ./pptp-purity.patch; + inherit ppp pptp; + }) + ]; + meta = { description = "PPtP plugin for NetworkManager"; inherit (networkmanager.meta) maintainers platforms; |