diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-29 00:10:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-29 00:10:52 +0000 |
| commit | dcfd9788a120ecea6763be2efe72b2e55b095ab9 (patch) | |
| tree | 9859bc6245466f5716253262a64b716154577b46 /pkgs/build-support | |
| parent | 3a3d290719f5e57e8c5fea1b952856d9fc759362 (diff) | |
| parent | a7776f951e7d74743c141dcce8a1789dea3c76fe (diff) | |
| download | nixpkgs-dcfd9788a120ecea6763be2efe72b2e55b095ab9.tar nixpkgs-dcfd9788a120ecea6763be2efe72b2e55b095ab9.tar.gz nixpkgs-dcfd9788a120ecea6763be2efe72b2e55b095ab9.tar.bz2 nixpkgs-dcfd9788a120ecea6763be2efe72b2e55b095ab9.tar.lz nixpkgs-dcfd9788a120ecea6763be2efe72b2e55b095ab9.tar.xz nixpkgs-dcfd9788a120ecea6763be2efe72b2e55b095ab9.tar.zst nixpkgs-dcfd9788a120ecea6763be2efe72b2e55b095ab9.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/writers/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 5a70bcbe3cf..47919c251af 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -15,12 +15,12 @@ rec { name = last (builtins.split "/" nameOrPath); in - pkgs.runCommandLocal name (if types.path.check content then { - inherit interpreter; - contentPath = content; - } else { + pkgs.runCommandLocal name (if (types.str.check content) then { inherit content interpreter; passAsFile = [ "content" ]; + } else { + inherit interpreter; + contentPath = content; }) '' # On darwin a script cannot be used as an interpreter in a shebang but # there doesn't seem to be a limit to the size of shebang and multiple |