diff options
| author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-04-04 02:28:01 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-04-04 02:28:01 +0200 |
| commit | 69b0873647a9378f5f46e1e1191e11ec50bbbf7d (patch) | |
| tree | 6c77b151f02cb59a4380b3b073d922f50482fea0 | |
| parent | 3d60f6401fe698262dfb636c506cc635b1c340dc (diff) | |
| download | nixpkgs-69b0873647a9378f5f46e1e1191e11ec50bbbf7d.tar nixpkgs-69b0873647a9378f5f46e1e1191e11ec50bbbf7d.tar.gz nixpkgs-69b0873647a9378f5f46e1e1191e11ec50bbbf7d.tar.bz2 nixpkgs-69b0873647a9378f5f46e1e1191e11ec50bbbf7d.tar.lz nixpkgs-69b0873647a9378f5f46e1e1191e11ec50bbbf7d.tar.xz nixpkgs-69b0873647a9378f5f46e1e1191e11ec50bbbf7d.tar.zst nixpkgs-69b0873647a9378f5f46e1e1191e11ec50bbbf7d.zip | |
duff, nxproxy, libxcomp: use autoreconfHook
| -rw-r--r-- | pkgs/development/libraries/libxcomp/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/admin/nxproxy/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/duff/default.nix | 7 |
3 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index f2a903a21da..c900cfbc684 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, libjpeg, libpng12, libX11, zlib }: +{ stdenv, fetchurl, autoreconfHook, libjpeg, libpng12, libX11, zlib }: let version = "3.5.0.31"; in stdenv.mkDerivation { @@ -17,11 +17,10 @@ stdenv.mkDerivation { maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ autoconf libjpeg libpng12 libX11 zlib ]; + buildInputs = [ autoreconfHook libjpeg libpng12 libX11 zlib ]; - preConfigure = '' + preAutoreconf = '' cd nxcomp/ - autoconf ''; enableParallelBuilding = true; diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index 8c973f0e53a..2422d2bb4f7 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, libxcomp }: +{ stdenv, fetchurl, autoreconfHook, libxcomp }: let version = "3.5.0.31"; in stdenv.mkDerivation { @@ -17,11 +17,10 @@ stdenv.mkDerivation { maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ autoconf libxcomp ]; + buildInputs = [ autoreconfHook libxcomp ]; - preConfigure = '' + preAutoreconf = '' cd nxproxy/ - autoconf ''; makeFlags = [ "exec_prefix=$(out)" ]; diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index 894ca2ef28d..d178be0f0fa 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, gettext }: +{ stdenv, fetchurl, autoreconfHook, gettext }: stdenv.mkDerivation rec { name = "duff-${version}"; @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "149dd80f9758085ed199c37aa32ad869409fa5e2c8da8a51294bd64ca886e058"; }; - buildInputs = [ autoconf automake gettext ]; + buildInputs = [ autoreconfHook gettext ]; - preConfigure = '' + preAutoreconf = '' # duff is currently badly packaged, requiring us to do extra work here that # should be done upstream. If that is ever fixed, this entire phase can be # removed along with all buildInputs. @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { ./gettextize sed 's@po/Makefile.in\( .*\)po/Makefile.in@po/Makefile.in \1@' \ -i configure.ac - autoreconf -i ''; meta = with stdenv.lib; { |