about summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-04-26 16:47:43 +0400
committerNikolay Amiantov <ab@fmap.me>2016-04-26 16:47:43 +0400
commitf6eb6862221bff46a143fb10b1c16a5ce1f32027 (patch)
tree22b68eb6bb5227a362b0987a3e722315d0ba15eb /pkgs/build-support
parent07cad5411ef18fa2de2e500d1a78e12a2b3fda6b (diff)
parent8415fa35c79214fc2093882ed688f98f9abf7048 (diff)
downloadnixlib-f6eb6862221bff46a143fb10b1c16a5ce1f32027.tar
nixlib-f6eb6862221bff46a143fb10b1c16a5ce1f32027.tar.gz
nixlib-f6eb6862221bff46a143fb10b1c16a5ce1f32027.tar.bz2
nixlib-f6eb6862221bff46a143fb10b1c16a5ce1f32027.tar.lz
nixlib-f6eb6862221bff46a143fb10b1c16a5ce1f32027.tar.xz
nixlib-f6eb6862221bff46a143fb10b1c16a5ce1f32027.tar.zst
nixlib-f6eb6862221bff46a143fb10b1c16a5ce1f32027.zip
Merge pull request #15002 from abbradar/symlink-join-wrappers
Use symlinkJoin for wrappers
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/trivial-builders.nix14
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index fef91e1d89dc..b0040cf18177 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -47,16 +47,24 @@ rec {
 
 
   # Create a forest of symlinks to the files in `paths'.
-  symlinkJoin = name: paths:
+  symlinkJoin =
+    { name
+    , paths
+    , preferLocalBuild ? true
+    , allowSubstitutes ? false
+    , postBuild ? ""
+    , buildInputs ? []
+    , meta ? {}
+    }:
     runCommand name
-      { inherit paths;
-        preferLocalBuild = true; allowSubstitutes = false;
+      { inherit paths preferLocalBuild allowSubstitutes buildInputs meta;
       }
       ''
         mkdir -p $out
         for i in $paths; do
           ${lndir}/bin/lndir $i $out
         done
+        ${postBuild}
       '';