From ebe1cbe0dad4632161842017094ebfd73253ffbf Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 27 May 2016 13:38:06 +0300
Subject: [PATCH] symlinkJoin: allow arbitrary additional attributes

---
 pkgs/build-support/trivial-builders.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index b0040cf1817..73f4d7783c4 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -48,17 +48,15 @@ rec {
 
   # Create a forest of symlinks to the files in `paths'.
   symlinkJoin =
-    { name
-    , paths
-    , preferLocalBuild ? true
-    , allowSubstitutes ? false
-    , postBuild ? ""
-    , buildInputs ? []
-    , meta ? {}
-    }:
+    args@{ name
+         , paths
+         , preferLocalBuild ? true
+         , allowSubstitutes ? false
+         , postBuild ? ""
+         , ...
+         }:
     runCommand name
-      { inherit paths preferLocalBuild allowSubstitutes buildInputs meta;
-      }
+      (removeAttrs args [ "name" "postBuild" ])
       ''
         mkdir -p $out
         for i in $paths; do