diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 620efd0cfad2..8f7e9cf14841 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -350,12 +350,10 @@ rec { ${lib.concatMapStringsSep "\n" (option: "set -o ${option}") bashOptions} '' + lib.optionalString (runtimeEnv != null) ( - lib.concatStrings ( - lib.mapAttrsToList (name: value: '' - ${lib.toShellVar name value} - export ${name} - '') runtimeEnv - ) + lib.concatMapAttrsStringSep "" (name: value: '' + ${lib.toShellVar name value} + export ${name} + '') runtimeEnv ) + lib.optionalString (runtimeInputs != [ ]) ''