diff --git a/pkgs/tools/nix/dnadd/default.nix b/pkgs/tools/nix/dnadd/default.nix index 3f4d76a9c4d4..59a0516629e1 100644 --- a/pkgs/tools/nix/dnadd/default.nix +++ b/pkgs/tools/nix/dnadd/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1vzbgz8y9gj4lszsx4iczfbrj373sl4wi43j7rp46zfcbw323d4r"; }; + strictDeps = true; makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { diff --git a/pkgs/tools/nix/info/default.nix b/pkgs/tools/nix/info/default.nix index 84bd3e891622..73c336afe045 100644 --- a/pkgs/tools/nix/info/default.nix +++ b/pkgs/tools/nix/info/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, coreutils, findutils, gnugrep, darwin +{ stdenv, lib, coreutils, findutils, gnugrep, darwin, bash # Avoid having GHC in the build-time closure of all NixOS configurations , doCheck ? false, shellcheck }: @@ -26,7 +26,9 @@ stdenv.mkDerivation { ''; inherit doCheck; + strictDeps = true; nativeCheckInputs = [ shellcheck ]; + buildInputs = [ bash ]; checkPhase = '' shellcheck ./nix-info diff --git a/pkgs/tools/nix/nix-script/default.nix b/pkgs/tools/nix/nix-script/default.nix index f9077ef13871..c83bfbc7a226 100644 --- a/pkgs/tools/nix/nix-script/default.nix +++ b/pkgs/tools/nix/nix-script/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "0yiqljamcj9x8z801bwj7r30sskrwv4rm6sdf39j83jqql1fyq7y"; }; - buildInputs = [ + strictDeps = true; + nativeBuildInputs = [ (haskellPackages.ghcWithPackages (hs: with hs; [ posix-escape ])) ]; diff --git a/pkgs/tools/nix/nixos-generators/default.nix b/pkgs/tools/nix/nixos-generators/default.nix index fa4495647c6e..bf3a387c439f 100644 --- a/pkgs/tools/nix/nixos-generators/default.nix +++ b/pkgs/tools/nix/nixos-generators/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, coreutils, jq, findutils, nix }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, coreutils, jq, findutils, nix, bash }: stdenv.mkDerivation rec { pname = "nixos-generators"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { rev = version; sha256 = "sha256-WecDwDY/hEcDQYzFnccCNa+5Umht0lfjx/d1qGDy/rQ="; }; + strictDeps = true; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bash ]; installFlags = [ "PREFIX=$(out)" ]; postFixup = '' wrapProgram $out/bin/nixos-generate \ diff --git a/pkgs/tools/nix/nixos-option/default.nix b/pkgs/tools/nix/nixos-option/default.nix index 9137e5a716c5..a9cc967d7680 100644 --- a/pkgs/tools/nix/nixos-option/default.nix +++ b/pkgs/tools/nix/nixos-option/default.nix @@ -3,6 +3,7 @@ stdenv.mkDerivation rec { name = "nixos-option"; src = ./.; + strictDeps = true; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost nix ]; meta = with lib; {