diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/tools/misc/autoconf | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/tools/misc/autoconf')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix | 3 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/tools/misc/autoconf/default.nix | 13 |
3 files changed, 16 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix b/nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix index 4ff990ca0ed2..8fba52aa1fd9 100644 --- a/nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/nixpkgs/pkgs/development/tools/misc/autoconf/2.13.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh"; }; - buildInputs = [ m4 perl ]; + nativeBuildInputs = [ m4 perl ]; + strictDeps = true; doCheck = true; diff --git a/nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix b/nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix index 8c6e104e11b8..daf026dc3a5b 100644 --- a/nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix +++ b/nixpkgs/pkgs/development/tools/misc/autoconf/2.64.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0j3jdjpf5ly39dlp0bg70h72nzqr059k0x8iqxvaxf106chpgn9j"; }; - buildInputs = [ m4 perl ]; + strictDeps = true; + nativeBuildInputs = [ m4 perl ]; + buildInputs = [ m4 ]; # Work around a known issue in Cygwin. See # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for diff --git a/nixpkgs/pkgs/development/tools/misc/autoconf/default.nix b/nixpkgs/pkgs/development/tools/misc/autoconf/default.nix index ac342086f6c5..1fcb819bd4b7 100644 --- a/nixpkgs/pkgs/development/tools/misc/autoconf/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/autoconf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, m4, perl }: +{ lib, stdenv, fetchurl, m4, perl, texinfo }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { pname = "autoconf"; version = "2.71"; + outputs = [ "out" "doc" ]; src = fetchurl { url = "mirror://gnu/autoconf/autoconf-${version}.tar.xz"; @@ -19,8 +20,16 @@ stdenv.mkDerivation rec { ./2.71-fix-race.patch ]; - nativeBuildInputs = [ m4 perl ]; + strictDeps = true; + nativeBuildInputs = [ m4 perl texinfo ]; buildInputs = [ m4 ]; + postBuild = " + make html + "; + + postInstall = " + make install-html + "; # Work around a known issue in Cygwin. See # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for |