diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-06-04 18:00:59 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-04 18:00:59 +0000 |
commit | 22e7031b281ab717fd281ae67ab3fde4b23bafbd (patch) | |
tree | 39ca36d835edf769bb7537016801d523a02788cb /pkgs/build-support | |
parent | 7da24051923f23ebe22ea176a7b826b07bd77eef (diff) | |
parent | 3f697e808b31a955462bc0b20b229d4072c99aa7 (diff) | |
download | nixpkgs-22e7031b281ab717fd281ae67ab3fde4b23bafbd.tar nixpkgs-22e7031b281ab717fd281ae67ab3fde4b23bafbd.tar.gz nixpkgs-22e7031b281ab717fd281ae67ab3fde4b23bafbd.tar.bz2 nixpkgs-22e7031b281ab717fd281ae67ab3fde4b23bafbd.tar.lz nixpkgs-22e7031b281ab717fd281ae67ab3fde4b23bafbd.tar.xz nixpkgs-22e7031b281ab717fd281ae67ab3fde4b23bafbd.tar.zst nixpkgs-22e7031b281ab717fd281ae67ab3fde4b23bafbd.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/trivial-builders/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 7152f9a1be4..d3cb22a1f53 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -141,7 +141,7 @@ rec { runCommand name { inherit text executable checkPhase allowSubstitutes preferLocalBuild; passAsFile = [ "text" ]; - meta = lib.optionalAttrs (toString executable != "" && matches != null) { + meta = lib.optionalAttrs (executable && matches != null) { mainProgram = lib.head matches; } // meta; } |