NetworkManager-pptp: fix path to pppd and pptp, upgrade

This commit is contained in:
Yury G. Kudryashov 2012-08-02 23:44:50 +04:00
parent fd330e9315
commit 64f932f8fd
2 changed files with 36 additions and 3 deletions

View File

@ -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
};

View File

@ -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;