summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-02-09 12:41:11 +0100
committerlassulus <lass@lassul.us>2017-02-09 12:41:11 +0100
commit954477b8674156754cd51021d92885b456a04a5b (patch)
treec5c77216bc7153763240bd964479136e7f1d4721
parent4e7fdf429f16c383c042292a47dd1cac0cb96f45 (diff)
k 5: fix proot signal 11 error with wrapper
-rw-r--r--krebs/5pkgs/default.nix11
1 files changed, 5 insertions, 6 deletions
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index e01b6e804..c79a639a4 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