diff options
| author | k0ral <koral@mailoo.org> | 2017-07-21 18:18:54 +0200 |
|---|---|---|
| committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-07-21 17:18:54 +0100 |
| commit | 596e279979d3da1c510aa356a97231b1399ec2b8 (patch) | |
| tree | 1ebb75b886b97300ab3f69c613595b2838077fbf /pkgs/tools/networking/network-manager | |
| parent | 92438d5ca9eb2e7a07fa1261d5f24e8440ade5fc (diff) | |
| download | nixlib-596e279979d3da1c510aa356a97231b1399ec2b8.tar nixlib-596e279979d3da1c510aa356a97231b1399ec2b8.tar.gz nixlib-596e279979d3da1c510aa356a97231b1399ec2b8.tar.bz2 nixlib-596e279979d3da1c510aa356a97231b1399ec2b8.tar.lz nixlib-596e279979d3da1c510aa356a97231b1399ec2b8.tar.xz nixlib-596e279979d3da1c510aa356a97231b1399ec2b8.tar.zst nixlib-596e279979d3da1c510aa356a97231b1399ec2b8.zip | |
network-manager-l2tp: fix configure step (#27541)
* network-manager-l2tp: don't run ./configure twice * network-manager-l2tp: remove automake/autoconf
Diffstat (limited to 'pkgs/tools/networking/network-manager')
| -rw-r--r-- | pkgs/tools/networking/network-manager/l2tp.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index 6a4f31e5e19f..5d6be9398874 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -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"; |