From 7e143dff04d898279f9cb5f6fc68626bc97aaa3f Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sun, 8 May 2022 13:12:47 -0400 Subject: [PATCH 1/3] autoconf: build offline html documentation --- pkgs/development/tools/misc/autoconf/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index ac342086f6c51..f67ebcefbc7e4 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/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,10 @@ stdenv.mkDerivation rec { ./2.71-fix-race.patch ]; - nativeBuildInputs = [ m4 perl ]; + 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 From 217e27c50d845b017fb544e90b7b694aa9ccc8f7 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sun, 8 May 2022 18:57:51 -0400 Subject: [PATCH 2/3] Update pkgs/development/tools/misc/autoconf/default.nix Co-authored-by: Sandro --- pkgs/development/tools/misc/autoconf/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index f67ebcefbc7e4..8bcdafa0700b3 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -22,8 +22,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ m4 perl texinfo ]; buildInputs = [ m4 ]; - postBuild = "make html"; - postInstall = "make install-html"; + 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 From c92da1d050db548fa8d02a27ae019f9e63eb27d6 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sun, 8 May 2022 18:58:01 -0400 Subject: [PATCH 3/3] Update pkgs/development/tools/misc/autoconf/default.nix Co-authored-by: Sandro --- pkgs/development/tools/misc/autoconf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 8bcdafa0700b3..63302c8ed94b6 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "autoconf"; version = "2.71"; - outputs = ["out" "doc"]; + outputs = [ "out" "doc" ]; src = fetchurl { url = "mirror://gnu/autoconf/autoconf-${version}.tar.xz";