From ad15b00c6bcbb4ffc7f326c8b5a379777cc0c30c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 3 Apr 2025 13:41:41 +0200 Subject: [PATCH] ghc: autoreconfHook This is required to apply patches that modify configure.ac and friends, but given we're already including most of it as inputs anyway, we might as well just always do it and get the additional benefit of knowing that the generated code corresponds to the source. --- pkgs/development/compilers/ghc/common-hadrian.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 6449ec17eb0a..4e60657ffa84 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -22,14 +22,12 @@ # build-tools bootPkgs, - autoconf, - automake, + autoreconfHook, coreutils, fetchurl, fetchgit, perl, python3, - m4, sphinx, xattr, autoSignDarwinBinariesHook, @@ -614,15 +612,12 @@ stdenv.mkDerivation ( nativeBuildInputs = [ + autoreconfHook perl hadrian bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - # autoconf and friends are necessary for hadrian to create the bindist - autoconf - automake - m4 # Python is used in a few scripts invoked by hadrian to generate e.g. rts headers. python3 # Tool used to update GHC's settings file in postInstall