nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 01:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

duff, nxproxy, libxcomp: use autoreconfHook

Browse Source
This commit is contained in:
Tobias Geerinckx-Rice 2015-04-04 02:28:01 +02:00
parent 3d60f6401f
commit 69b0873647
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/libxcomp/default.nix
View File

@ -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 let version = "3.5.0.31"; in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -17,11 +17,10 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ nckx ]; maintainers = with maintainers; [ nckx ];
}; };
buildInputs = [ autoconf libjpeg libpng12 libX11 zlib ]; buildInputs = [ autoreconfHook libjpeg libpng12 libX11 zlib ];
preConfigure = '' preAutoreconf = ''
cd nxcomp/ cd nxcomp/
autoconf
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

7
pkgs/tools/admin/nxproxy/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoconf, libxcomp }: { stdenv, fetchurl, autoreconfHook, libxcomp }:
let version = "3.5.0.31"; in let version = "3.5.0.31"; in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -17,11 +17,10 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ nckx ]; maintainers = with maintainers; [ nckx ];
}; };
buildInputs = [ autoconf libxcomp ]; buildInputs = [ autoreconfHook libxcomp ];
preConfigure = '' preAutoreconf = ''
cd nxproxy/ cd nxproxy/
autoconf
''; '';
makeFlags = [ "exec_prefix=$(out)" ]; makeFlags = [ "exec_prefix=$(out)" ];

7
pkgs/tools/filesystems/duff/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoconf, automake, gettext }: { stdenv, fetchurl, autoreconfHook, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "duff-${version}"; name = "duff-${version}";
@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "149dd80f9758085ed199c37aa32ad869409fa5e2c8da8a51294bd64ca886e058"; sha256 = "149dd80f9758085ed199c37aa32ad869409fa5e2c8da8a51294bd64ca886e058";
}; };
buildInputs = [ autoconf automake gettext ]; buildInputs = [ autoreconfHook gettext ];
preConfigure = '' preAutoreconf = ''
# duff is currently badly packaged, requiring us to do extra work here that # 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 # should be done upstream. If that is ever fixed, this entire phase can be
# removed along with all buildInputs. # removed along with all buildInputs.
@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
./gettextize ./gettextize
sed 's@po/Makefile.in\( .*\)po/Makefile.in@po/Makefile.in \1@' \ sed 's@po/Makefile.in\( .*\)po/Makefile.in@po/Makefile.in \1@' \
-i configure.ac -i configure.ac
autoreconf -i
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {