diff options
author | tv <tv@krebsco.de> | 2017-02-09 14:54:56 +0100 |
---|---|---|
committer | tv <tv@krebsco.de> | 2017-02-09 14:54:56 +0100 |
commit | 38d2ff961f2ad8d02ae6061952abe42e4de89f75 (patch) | |
tree | a8573db9389ba5268a8fb83ddef6d92e3e1a7815 /krebs/5pkgs/default.nix | |
parent | ed406bd979609fd05f5846049f571f43e6512050 (diff) | |
parent | 954477b8674156754cd51021d92885b456a04a5b (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/5pkgs/default.nix')
-rw-r--r-- | krebs/5pkgs/default.nix | 11 |
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 |