From 1a0edf135a3000a6af7200d4f2e4e344922f186d Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 29 Sep 2021 09:34:45 +0200
Subject: [PATCH] dockerTools.exportImage: Make $out a tarball again

---
 pkgs/build-support/docker/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index edb8837015c8..47fd99c12f8e 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -287,6 +287,12 @@ rec {
         echo "Packing raw image..."
         tar -C mnt --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar .
       '';
+
+      postUmount = ''
+        mv $out/layer.tar .
+        rm -rf $out
+        mv layer.tar $out
+      '';
     };
 
   # Create an executable shell script which has the coreutils in its