BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

autoreconfHook: make overridable

Browse source 
Some packages have specific autotools requirements that don't apply to
any other packages.  We want to be able to use autoreconfHook for
these packages with the required autotools versions, but we don't want
to have to makeSetupHook for each one, or have a top-level attribute
for every combination.

So, use callPackage around the makeSetupHook call so that the
autotools used by autoreconfHook can be overridden.  This way, a
custom autoreconfHook can be passed to a package like this:

    autoreconfHook = with buildPackages;
      autoreconfHook.override { automake = automake115x; };

And we can simplify the definitions of our existing autoreconfHook264
and autoreconfHook269 attributes.
This commit is contained in:
Alyssa Ross 2021-01-24 23:21:34 +00:00
parent cfa16434c2
commit 8bad690603
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/top-level/all-packages.nix
View file

@ -112,17 +112,21 @@ in
{ name = "auto-blas-hook"; deps = [ blas lapack ]; }
../build-support/setup-hooks/audit-blas.sh;
autoreconfHook = makeSetupHook
{ deps = [ autoconf automake gettext libtool ]; }
../build-support/setup-hooks/autoreconf.sh;
autoreconfHook = callPackage (
{ makeSetupHook, autoconf, automake, gettext, libtool }:
makeSetupHook
{ deps = [ autoconf automake gettext libtool ]; }
../build-support/setup-hooks/autoreconf.sh
) { };
autoreconfHook264 = makeSetupHook
{ deps = [ autoconf264 automake111x gettext libtool ]; }
../build-support/setup-hooks/autoreconf.sh;
autoreconfHook264 = autoreconfHook.override {
autoconf = autoconf264;
automake = automake111x;
};
autoreconfHook269 = makeSetupHook
{ deps = [ autoconf269 automake gettext libtool ]; }
../build-support/setup-hooks/autoreconf.sh;
autoreconfHook269 = autoreconfHook.override {
autoconf = autoconf269;
};
autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; }
../build-support/setup-hooks/auto-patchelf.sh;