From 4e7fdf429f16c383c042292a47dd1cac0cb96f45 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 9 Feb 2017 09:50:28 +0100
Subject: proot: fix seccomp filters

---
 krebs/5pkgs/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'krebs/5pkgs/default.nix')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index c1ec0f33..e01b6e80 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -44,6 +44,14 @@ with import <stockholm/lib>;
     };
     buildbot-worker = callPackage ./buildbot/worker.nix {};
 
+    # https://github.com/proot-me/PRoot/issues/106
+    proot = overrideDerivation pkgs.proot (oldAttrs: {
+      patches = singleton (pkgs.fetchurl {
+        url = https://github.com/openmole/PRoot/commit/10119a1f1fd7dea012464ae176c2b5fc3eb18928.diff;
+        sha256 = "0cmd95mz8p5ifjvfvi4g9zzyxqddbscxin2j3a9zbmbjl2wi458g";
+      });
+    });
+
     # XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d
     symlinkJoin = { name, paths, ... }@args: let
       x = pkgs.symlinkJoin args;
-- 
cgit v1.2.3


From 954477b8674156754cd51021d92885b456a04a5b Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Thu, 9 Feb 2017 12:41:11 +0100
Subject: k 5: fix proot signal 11 error with wrapper

---
 krebs/5pkgs/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'krebs/5pkgs/default.nix')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index e01b6e80..c79a639a 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -45,12 +45,11 @@ with import <stockholm/lib>;
     buildbot-worker = callPackage ./buildbot/worker.nix {};
 
     # https://github.com/proot-me/PRoot/issues/106
-    proot = overrideDerivation pkgs.proot (oldAttrs: {
-      patches = singleton (pkgs.fetchurl {
-        url = https://github.com/openmole/PRoot/commit/10119a1f1fd7dea012464ae176c2b5fc3eb18928.diff;
-        sha256 = "0cmd95mz8p5ifjvfvi4g9zzyxqddbscxin2j3a9zbmbjl2wi458g";
-      });
-    });
+    proot = pkgs.writeScriptBin "proot" ''
+      #!${pkgs.dash}/bin/dash
+      export PROOT_NO_SECCOMP=1
+      exec ${pkgs.proot}/bin/proot "$@"
+    '';
 
     # XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d
     symlinkJoin = { name, paths, ... }@args: let
-- 
cgit v1.2.3