diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-27 18:01:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-27 18:01:02 +0000 |
| commit | 410019beb50f55c9f5453f10c71dd143cfa0607f (patch) | |
| tree | 5b165ac1d4194468ebd8e3620d51400a26be126f /pkgs/build-support | |
| parent | 503801f54026c8505e87bc1cc8e07574c147e202 (diff) | |
| parent | d6411ed8c6ecaed2c17840551326952c75704689 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 6b8a03932f5b2..86bd7e312cbd3 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -637,7 +637,7 @@ rec { if tag != null then tag else - lib.head (lib.strings.splitString "-" (baseNameOf result.outPath)); + lib.head (lib.strings.splitString "-" (baseNameOf (builtins.unsafeDiscardStringContext result.outPath))); } '' ${lib.optionalString (tag == null) '' outName="$(basename "$out")" @@ -1001,7 +1001,7 @@ rec { if tag != null then tag else - lib.head (lib.strings.splitString "-" (baseNameOf conf.outPath)); + lib.head (lib.strings.splitString "-" (baseNameOf (builtins.unsafeDiscardStringContext conf.outPath))); paths = buildPackages.referencesByPopularity overallClosure; nativeBuildInputs = [ jq ]; } '' |