diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index c6840241c609..65d53dd648d9 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -4,19 +4,19 @@ fetchurl, autoreconfHook, gettext, - guileSupport ? false, + gnumake, guile, - texinfo, + guileSupport ? false, # avoid guile depend on bootstrap to prevent dependency cycles inBootstrap ? false, pkg-config, - gnumake, + texinfo, + versionCheckHook, }: let guileEnabled = guileSupport && !inBootstrap; in - stdenv.mkDerivation (finalAttrs: { pname = "gnumake"; version = "4.4.1"; @@ -69,12 +69,16 @@ stdenv.mkDerivation (finalAttrs: { ''; postInstall = lib.optionalString (!inBootstrap) '' - mkdir -p $doc/share/doc/$pname-$version - cp ./make.html $doc/share/doc/$pname-$version/index.html + install -Dm644 make.html \ + --target-directory="$doc"/share/doc/"$pname"-"$version" ''; separateDebugInfo = true; + doCheck = true; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + passthru.tests = { # make sure that the override doesn't break bootstrapping gnumakeWithGuile = gnumake.override { guileSupport = true; }; @@ -84,18 +88,19 @@ stdenv.mkDerivation (finalAttrs: { description = "Tool to control the generation of non-source files from sources"; longDescription = '' Make is a tool which controls the generation of executables and - other non-source files of a program from the program's source files. + other non-source files of a program from the program's source + files. Make gets its knowledge of how to build your program from a file - called the makefile, which lists each of the non-source files and - how to compute it from other files. When you write a program, you - should write a makefile for it, so that it is possible to use Make - to build and install the program. + called the makefile, which lists each of the non-source files + and how to compute it from other files. When you write a + program, you should write a makefile for it, so that it is + possible to use Make to build and install the program. ''; homepage = "https://www.gnu.org/software/make/"; license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.mdaniels5757 ]; mainProgram = "make"; + maintainers = with lib.maintainers; [ mdaniels5757 ]; platforms = lib.platforms.all; }; })