From 47adaa80e310ed270b2bccb05cf2c10d30cde453 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Mar 2011 16:33:33 +0000
Subject: * Move the wrapPythonPrograms function into a separate setup hook  
 (wrapPython).

svn path=/nixpkgs/branches/modular-python/; revision=26580
---
 pkgs/build-support/trivial-builders.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'pkgs/build-support/trivial-builders.nix')

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 992e28476f0..1998d91d126 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -45,12 +45,14 @@ rec {
 
 
   # Make a package that just contains a setup hook with the given contents.
-  makeSetupHook = script:
-    runCommand "hook" {}
-      ''
+  makeSetupHook = deps: script:
+    runCommand "hook" { }
+      (''
         ensureDir $out/nix-support
         cp ${script} $out/nix-support/setup-hook
-      '';
+      '' + stdenv.lib.optionalString (deps != []) ''
+        echo ${toString deps} > $out/nix-support/propagated-build-native-inputs
+      '');
 
 
   # Write the references (i.e. the runtime dependencies in the Nix store) of `path' to a file.
-- 
cgit 1.4.1