diff options
author | Rebecca Turner <rbt@sent.as> | 2024-01-12 13:02:17 -0800 |
---|---|---|
committer | Rebecca Turner <rbt@sent.as> | 2024-02-01 16:02:32 -0800 |
commit | ac20bcf44925e7d290bf2f3135bd234ad6bc1bf7 (patch) | |
tree | 24de6e0050117a22a64f5b44431b3630e766722a /pkgs/build-support | |
parent | 185474c3ec482062b9978969c92c0635f80ab049 (diff) | |
download | nixlib-ac20bcf44925e7d290bf2f3135bd234ad6bc1bf7.tar nixlib-ac20bcf44925e7d290bf2f3135bd234ad6bc1bf7.tar.gz nixlib-ac20bcf44925e7d290bf2f3135bd234ad6bc1bf7.tar.bz2 nixlib-ac20bcf44925e7d290bf2f3135bd234ad6bc1bf7.tar.lz nixlib-ac20bcf44925e7d290bf2f3135bd234ad6bc1bf7.tar.xz nixlib-ac20bcf44925e7d290bf2f3135bd234ad6bc1bf7.tar.zst nixlib-ac20bcf44925e7d290bf2f3135bd234ad6bc1bf7.zip |
writeShellApplication: Add `bashOptions` argument
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/trivial-builders/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 9643c9ba048e..a8a07f6d071e 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -272,6 +272,7 @@ rec { , meta ? { } , checkPhase ? null , excludeShellChecks ? [ ] + , bashOptions ? [ "errexit" "nounset" "pipefail" ] }: writeTextFile { inherit name meta; @@ -281,9 +282,7 @@ rec { preferLocalBuild = false; text = '' #!${runtimeShell} - set -o errexit - set -o nounset - set -o pipefail + ${lib.concatMapStringsSep "\n" (option: "set -o ${option}") bashOptions} '' + lib.optionalString (runtimeInputs != [ ]) '' export PATH="${lib.makeBinPath runtimeInputs}:$PATH" |