From 8378838c197e8460895c7fb65d81c91c7e601f61 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Thu, 2 Sep 2021 07:39:20 +0100
Subject: [PATCH] revert

---
 ci/niv-cron.nix | 5 +++--
 ci/nodes.nix    | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ci/niv-cron.nix b/ci/niv-cron.nix
index 4a98a093..d4d94555 100644
--- a/ci/niv-cron.nix
+++ b/ci/niv-cron.nix
@@ -7,7 +7,7 @@ with lib; {
 
   nix.config = {
     extra-platforms = "aarch64-linux";
-    extra-sandbox-paths = with channels.cipkgs; map (package: builtins.unsafeDiscardStringContext "${package}?") [bash qemu "/run/binfmt"];
+    #extra-sandbox-paths = with channels.cipkgs; map (package: builtins.unsafeDiscardStringContext "${package}?") [bash qemu "/run/binfmt"];
   };
 
   gh-actions.env.OPENSSH_PRIVATE_KEY = "\${{ secrets.OPENSSH_PRIVATE_KEY }}";
@@ -18,7 +18,7 @@ with lib; {
     aarch64binfmt =
       let
         makeQemuWrapper = name: ''
-          mkdir -f /run/binfmt
+          mkdir -p /run/binfmt
           rm -f /run/binfmt/${name}
           cat > /run/binfmt/${name} << 'EOF'
           #!${channels.cipkgs.bash}/bin/sh
@@ -28,6 +28,7 @@ with lib; {
         ''; in
       channels.cipkgs.writeShellScriptBin "aarch64binfmt" ''
         ${makeQemuWrapper "aarch64"}
+        echo 'extra-sandbox-paths = ${channels.cipkgs.bash} ${channels.cipkgs.qemu} /run/binfmt' >> /etc/nix/nix.conf
         echo ':aarch64-linux:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff:/run/binfmt/aarch64:' > /proc/sys/fs/binfmt_misc/register
       '';
   };
diff --git a/ci/nodes.nix b/ci/nodes.nix
index 232616b6..9c8da8ff 100644
--- a/ci/nodes.nix
+++ b/ci/nodes.nix
@@ -6,7 +6,7 @@
 
   nix.config = {
     extra-platforms = "aarch64-linux";
-    extra-sandbox-paths = with channels.cipkgs; map (package: builtins.unsafeDiscardStringContext "${package}?") [bash qemu "/run/binfmt"];
+    #extra-sandbox-paths = with channels.cipkgs; map (package: builtins.unsafeDiscardStringContext "${package}?") [bash qemu "/run/binfmt"];
   };
 
   gh-actions = {
@@ -36,6 +36,7 @@
         ''; in
       channels.cipkgs.writeShellScriptBin "aarch64binfmt" ''
         ${makeQemuWrapper "aarch64"}
+        echo 'extra-sandbox-paths = ${channels.cipkgs.bash} ${channels.cipkgs.qemu} /run/binfmt' >> /etc/nix/nix.conf
         echo ':aarch64-linux:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff:/run/binfmt/aarch64:' > /proc/sys/fs/binfmt_misc/register
       '';
     sourceCache = channels.cipkgs.runCommand "sources"