From 5d429f6822da14592596eafb7c0392277a21aa01 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 26 Mar 2019 11:07:24 +0100 Subject: [PATCH] dockerTools: storePathToLayer use runtimeShell in script --- pkgs/build-support/docker/default.nix | 2 +- pkgs/build-support/docker/store-path-to-layer.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 8d47f1570138..04e393e6af6d 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -284,7 +284,7 @@ rec { }: let storePathToLayer = substituteAll - { inherit (stdenv) shell; + { shell = runtimeShell; isExecutable = true; src = ./store-path-to-layer.sh; }; diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh index ff814c1f6130..813623dd874c 100755 --- a/pkgs/build-support/docker/store-path-to-layer.sh +++ b/pkgs/build-support/docker/store-path-to-layer.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#! @shell@ set -eu