From c391a7b7f81f30de59b3bf186bf0e51ad0e308ce Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Sat, 21 Sep 2019 15:03:46 +0100
Subject: [PATCH] fix(build-image): Use absolute paths in tarballs

---
 tools/nixery/build-image/build-image.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/nixery/build-image/build-image.nix b/tools/nixery/build-image/build-image.nix
index 8f54f5326..9cfb806e4 100644
--- a/tools/nixery/build-image/build-image.nix
+++ b/tools/nixery/build-image/build-image.nix
@@ -133,11 +133,11 @@ let
   # their contents.
   pathsToLayer = paths: runCommand "layer.tar" {
   } ''
-    tar --no-recursion -rf "$out" \
+    tar --no-recursion -Prf "$out" \
         --mtime="@$SOURCE_DATE_EPOCH" \
         --owner=0 --group=0 /nix /nix/store
 
-    tar -rpf "$out" --hard-dereference --sort=name \
+    tar -Prpf "$out" --hard-dereference --sort=name \
         --mtime="@$SOURCE_DATE_EPOCH" \
         --owner=0 --group=0 ${lib.concatStringsSep " " paths}
   '';