diff options
| author | lewo <lewo@abesis.fr> | 2019-04-06 19:01:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-06 19:01:19 +0200 |
| commit | a8beff987d242ef11469a1fd01dfff6a474b8ec9 (patch) | |
| tree | f9bdd3f6a53a76ea33ab0c17284f9eb9e858f3ca | |
| parent | b3e40328f5b9cb8e743970bf86e3c58b47feac1a (diff) | |
| parent | 5d429f6822da14592596eafb7c0392277a21aa01 (diff) | |
| download | nixpkgs-a8beff987d242ef11469a1fd01dfff6a474b8ec9.tar nixpkgs-a8beff987d242ef11469a1fd01dfff6a474b8ec9.tar.gz nixpkgs-a8beff987d242ef11469a1fd01dfff6a474b8ec9.tar.bz2 nixpkgs-a8beff987d242ef11469a1fd01dfff6a474b8ec9.tar.lz nixpkgs-a8beff987d242ef11469a1fd01dfff6a474b8ec9.tar.xz nixpkgs-a8beff987d242ef11469a1fd01dfff6a474b8ec9.tar.zst nixpkgs-a8beff987d242ef11469a1fd01dfff6a474b8ec9.zip | |
Merge pull request #58350 from xtruder/pkgs/dockerTools/storePathToLayer/runtimeShell
dockerTools: storePathToLayer use runtimeShell in script
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 2 | ||||
| -rwxr-xr-x | 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 344f1abc8b2..11945e7b6f7 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -289,7 +289,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 4cf338b9b25..ab956c81904 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 |