From ff4b82c966c0f9f145efea6659ff7a850f68d514 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 8 Aug 2018 21:40:01 +0000 Subject: [PATCH] nix-info: use checkInputs --- pkgs/tools/nix/info/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/nix/info/default.nix b/pkgs/tools/nix/info/default.nix index cfdef4dd561..898026a6290 100644 --- a/pkgs/tools/nix/info/default.nix +++ b/pkgs/tools/nix/info/default.nix @@ -1,15 +1,12 @@ -{ stdenv, lib, coreutils, findutils, gnugrep, darwin, shellcheck -, doCheck ? false # Avoid having GHC in the build-time closure of all NixOS configuratinos +{ stdenv, lib, coreutils, findutils, gnugrep, darwin +# Avoid having GHC in the build-time closure of all NixOS configurations +, doCheck ? false, shellcheck }: stdenv.mkDerivation { name = "nix-info"; src = ./info.sh; - nativeBuildInputs = lib.optionals doCheck [ - shellcheck - ]; - path = lib.makeBinPath ([ coreutils findutils gnugrep ] ++ (if stdenv.isDarwin then [ darwin.DarwinTools ] else [])); @@ -29,6 +26,8 @@ stdenv.mkDerivation { ''; inherit doCheck; + checkInputs = [ shellcheck ]; + checkPhase = '' shellcheck ./nix-info '';