summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-05-19 23:55:29 +0200
committerlassulus <lass@aidsballs.de>2016-05-19 23:55:29 +0200
commitf46b3153c0c85883c9b3a98291f6d440f83bd717 (patch)
treeac4adcbe79d1f10ef565161c0598620911f436cb
parent98ea195b12870042326f76b2182f64a65eb7e978 (diff)
symlinkJoin: compat
-rw-r--r--krebs/5pkgs/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index bcc894b2c..2f9049516 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -36,6 +36,11 @@ with config.krebs.lib;
ReaktorPlugins = callPackage ./Reaktor/plugins.nix {};
+ # XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d
+ symlinkJoin = { name, paths, ... }@args: let
+ x = pkgs.symlinkJoin args;
+ in if typeOf x != "lambda" then x else pkgs.symlinkJoin name paths;
+
test = {
infest-cac-centos7 = callPackage ./test/infest-cac-centos7 {};
};