mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
duff, nxproxy, libxcomp: use autoreconfHook
This commit is contained in:
parent
3d60f6401f
commit
69b0873647
@ -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;
|
||||
|
@ -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)" ];
|
||||
|
@ -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; {
|
||||
|
Loading…
Reference in New Issue
Block a user