refactor to use autoreconfHook where possible

Close #12446.
This commit is contained in:
Robin Gloster
2016-01-17 23:04:40 +00:00
committed by Vladimír Čunát
parent 620c147cce
commit 53b389327e
50 changed files with 188 additions and 320 deletions

View File

@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, makeWrapper, autoconf, automake,
libmspack, openssl, pam, xercesc, icu, libdnet, procps,
{ stdenv, lib, fetchurl, makeWrapper, autoreconfHook,
libmspack, openssl, pam, xercesc, icu, libdnet, procps,
xlibsWrapper, libXinerama, libXi, libXrender, libXrandr, libXtst,
pkgconfig, glib, gtk, gtkmm }:
@@ -16,8 +16,8 @@ in stdenv.mkDerivation {
sha256 = "15lwayrz9bpx4z12fj616hsn25m997y72licwwz7kms4sx9ssip1";
};
buildInputs =
[ autoconf automake makeWrapper libmspack openssl pam xercesc icu libdnet procps
buildInputs =
[ autoreconfHook makeWrapper libmspack openssl pam xercesc icu libdnet procps
pkgconfig glib gtk gtkmm xlibsWrapper libXinerama libXi libXrender libXrandr libXtst ];
patchPhase = ''
@@ -28,7 +28,6 @@ in stdenv.mkDerivation {
patches = [ ./recognize_nixos.patch ];
preConfigure = "autoreconf";
configureFlags = "--without-kernel-modules --without-xmlsecurity";
meta = with stdenv.lib; {