Merge remote-tracking branch 'origin/develop' into feature/ddw-637-ad…

…d-timestamp-for-paper-wallet-pdf-name
input-output-hk · May 13, 2019 · ead9b5f · ead9b5f
2 parents 137694d + 4fa1a9c
commit ead9b5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/default.nix b/default.nix
@@ -279,6 +279,7 @@ let
       mkdir -p etc
       cat /etc/hosts > etc/hosts
       cat /etc/nsswitch.conf > etc/nsswitch.conf
+      cat /etc/localtime > etc/localtime
       cat /etc/machine-id > etc/machine-id
       cat /etc/resolv.conf > etc/resolv.conf
 

diff --git a/installers/nix/nix-installer.nix b/installers/nix/nix-installer.nix
@@ -64,6 +64,7 @@ let
     mkdir -p etc
     cat /etc/hosts > etc/hosts
     cat /etc/nsswitch.conf > etc/nsswitch.conf
+    cat /etc/localtime > etc/localtime
     cat /etc/machine-id > etc/machine-id
     cat /etc/resolv.conf > etc/resolv.conf