diff options
| author | Guillaume Girol <symphorien+git@xlumurb.eu> | 2022-12-18 12:00:00 +0000 |
|---|---|---|
| committer | Guillaume Girol <symphorien+git@xlumurb.eu> | 2023-01-21 16:42:10 +0100 |
| commit | dcfdd9d8da7d25cf3753ba35983e13581e07eeac (patch) | |
| tree | 24fdc5d3b640012f5b96306923184129e6fdfc94 /pkgs/development/interpreters/tcl | |
| parent | 339a5491bbab587d6cb84a960377f88546ffb535 (diff) | |
mkTclDerivation: support nativeCheckInputs
Diffstat (limited to 'pkgs/development/interpreters/tcl')
| -rw-r--r-- | pkgs/development/interpreters/tcl/mk-tcl-derivation.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix b/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix index 0e44eb3585935..57d60f0f2a65b 100644 --- a/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix +++ b/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix @@ -10,6 +10,7 @@ , nativeBuildInputs ? [] , propagatedBuildInputs ? [] , checkInputs ? [] +, nativeCheckInputs ? [] # true if we should skip the configuration phase altogether , dontConfigure ? false @@ -27,7 +28,7 @@ let inherit (tcl) stdenv; - inherit (lib) getBin optionalAttrs optionals; + inherit (lib) getBin optionalAttrs; defaultTclPkgConfigureFlags = [ "--with-tcl=${tcl}/lib" @@ -36,7 +37,7 @@ let ]; self = (stdenv.mkDerivation ((builtins.removeAttrs attrs [ - "addTclConfigureFlags" "checkPhase" "checkInputs" "doCheck" + "addTclConfigureFlags" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" ]) // { buildInputs = buildInputs ++ [ tcl.tclPackageHook ]; @@ -47,8 +48,9 @@ let # Run tests after install, at which point we've done all TCLLIBPATH setup doCheck = false; - doInstallCheck = attrs.doCheck or ((attrs ? doInstallCheck) && attrs.doInstallCheck); - installCheckInputs = checkInputs ++ (optionals (attrs ? installCheckInputs) attrs.installCheckInputs); + doInstallCheck = attrs.doCheck or (attrs.doInstallCheck or false); + installCheckInputs = checkInputs ++ (attrs.installCheckInputs or []); + nativeInstallCheckInputs = nativeCheckInputs ++ (attrs.nativeInstallCheckInputs or []); # Add typical values expected by TEA for configureFlags configureFlags = |