diff options
| author | obadz <obadz-git@obadz.com> | 2016-06-22 01:59:52 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-06-22 02:33:39 +0100 |
| commit | 9191f09c0569821e11f9a7f0c552e794087a8163 (patch) | |
| tree | d8488b21535f0a4e791e02f5fc7b96cd7e5b7ab5 /pkgs/tools/networking/network-manager | |
| parent | b07051ce6c3ba3039c89b6755da279002b0c3ace (diff) | |
| download | nixlib-9191f09c0569821e11f9a7f0c552e794087a8163.tar nixlib-9191f09c0569821e11f9a7f0c552e794087a8163.tar.gz nixlib-9191f09c0569821e11f9a7f0c552e794087a8163.tar.bz2 nixlib-9191f09c0569821e11f9a7f0c552e794087a8163.tar.lz nixlib-9191f09c0569821e11f9a7f0c552e794087a8163.tar.xz nixlib-9191f09c0569821e11f9a7f0c552e794087a8163.tar.zst nixlib-9191f09c0569821e11f9a7f0c552e794087a8163.zip | |
network-manager/pptp: replace patch by substitutions to simplify upgrades
Diffstat (limited to 'pkgs/tools/networking/network-manager')
| -rw-r--r-- | pkgs/tools/networking/network-manager/pptp-purity.patch | 26 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/pptp.nix | 17 |
2 files changed, 9 insertions, 34 deletions
diff --git a/pkgs/tools/networking/network-manager/pptp-purity.patch b/pkgs/tools/networking/network-manager/pptp-purity.patch deleted file mode 100644 index 88af666b6580..000000000000 --- a/pkgs/tools/networking/network-manager/pptp-purity.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 -@@ -730,9 +730,7 @@ nm_find_pppd (void) - { - static const char *pppd_binary_paths[] = - { -- "/sbin/pppd", -- "/usr/sbin/pppd", -- "/usr/local/sbin/pppd", -+ "@ppp@/sbin/pppd", - NULL - }; - -@@ -752,9 +750,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 1b1cf69119e4..12f28d840edd 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig, substituteAll +{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig , libsecret, withGnome ? true, gnome3 }: stdenv.mkDerivation rec { @@ -17,18 +17,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; + postPatch = '' + sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-pptp-service.c + + substituteInPlace ./src/nm-pptp-service.c \ + --replace /sbin/pptp ${pptp}/bin/pptp \ + --replace /sbin/pppd ${ppp}/bin/pppd + ''; + configureFlags = if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"; postConfigure = "sed 's/-Werror//g' -i Makefile */Makefile"; - patches = - [ ( substituteAll { - src = ./pptp-purity.patch; - inherit ppp pptp; - }) - ]; - meta = { description = "PPtP plugin for NetworkManager"; inherit (networkmanager.meta) maintainers platforms; |