summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-02-09 10:08:17 +0100
committermakefu <github@syntax-fehler.de>2017-02-09 10:08:17 +0100
commit4f34c772c2dd4e48a303d3ea3349ec11cd747498 (patch)
treead4e46d310d9a70ecb08164a256dfdcdd343eedc
parent268e43841d1e44fd73d2e1f5bd3635bda0cabdb8 (diff)
parented406bd979609fd05f5846049f571f43e6512050 (diff)
Merge remote-tracking branch 'tv/master'
-rw-r--r--krebs/5pkgs/default.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index c1ec0f333..e01b6e804 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;