diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-28 16:33:33 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-28 16:33:33 +0000 |
| commit | 47adaa80e310ed270b2bccb05cf2c10d30cde453 (patch) | |
| tree | 27ff8c9be064967b0b264814fb7fee57137b87b0 /pkgs/build-support/trivial-builders.nix | |
| parent | 641834ddf6aa2e3876378f04ee4f47c3b2153542 (diff) | |
| download | nixpkgs-47adaa80e310ed270b2bccb05cf2c10d30cde453.tar nixpkgs-47adaa80e310ed270b2bccb05cf2c10d30cde453.tar.gz nixpkgs-47adaa80e310ed270b2bccb05cf2c10d30cde453.tar.bz2 nixpkgs-47adaa80e310ed270b2bccb05cf2c10d30cde453.tar.lz nixpkgs-47adaa80e310ed270b2bccb05cf2c10d30cde453.tar.xz nixpkgs-47adaa80e310ed270b2bccb05cf2c10d30cde453.tar.zst nixpkgs-47adaa80e310ed270b2bccb05cf2c10d30cde453.zip | |
* Move the wrapPythonPrograms function into a separate setup hook
(wrapPython). svn path=/nixpkgs/branches/modular-python/; revision=26580
Diffstat (limited to 'pkgs/build-support/trivial-builders.nix')
| -rw-r--r-- | pkgs/build-support/trivial-builders.nix | 10 |
1 files changed, 6 insertions, 4 deletions
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. |