BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

network-manager-l2tp: fix configure step (#27541)

Browse source 
* network-manager-l2tp: don't run ./configure twice

* network-manager-l2tp: remove automake/autoconf
This commit is contained in:
k0ral 2017-07-21 18:18:54 +02:00 committed by Jörg Thalheim
parent 92438d5ca9
commit 596e279979
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/tools/networking/network-manager/l2tp.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, automake, autoconf, libtool, intltool, pkgconfig
{ stdenv, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig
, networkmanager, ppp, xl2tpd, strongswan, libsecret
, withGnome ? true, gnome3, networkmanagerapplet }:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ networkmanager ppp libsecret ]
++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring networkmanagerapplet ];
nativeBuildInputs = [ automake autoconf libtool intltool pkgconfig ];
nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ];
postPatch = ''
sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-l2tp-service.c
@ -27,7 +27,9 @@ stdenv.mkDerivation rec {
--replace /sbin/xl2tpd ${xl2tpd}/bin/xl2tpd
'';
preConfigure = "./autogen.sh";
preConfigure = ''
intltoolize -f
'';
configureFlags =
if withGnome then "--with-gnome" else "--without-gnome";