From ac20bcf44925e7d290bf2f3135bd234ad6bc1bf7 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Fri, 12 Jan 2024 13:02:17 -0800 Subject: [PATCH] writeShellApplication: Add `bashOptions` argument --- pkgs/build-support/trivial-builders/default.nix | 5 ++--- 1 file 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"