From 3a262f1c24df23536e4a5f7d4346a4c240fde849 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 16 Feb 2019 18:15:13 +0100 Subject: symlinkJoin: remove compatibility This reverts commit f46b3153c0c85883c9b3a98291f6d440f83bd717. --- krebs/5pkgs/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index dc04b6a7..387f3896 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -31,9 +31,4 @@ foldl' mergeAttrs {} export PROOT_NO_SECCOMP=1 exec ${super.proot}/bin/proot "$@" ''; - - # XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d - symlinkJoin = { name, paths, ... }@args: let - x = super.symlinkJoin args; - in if typeOf x != "lambda" then x else super.symlinkJoin name paths; } -- cgit v1.2.3