diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-29 15:19:59 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-29 15:19:59 +0000 |
| commit | 353d4508672f05965835f7122b1551f08472776c (patch) | |
| tree | c2bb7066f6ad0af30b9ec75c94e76cc232aaa9ff /pkgs/build-support | |
| parent | 11b67ccee5a2f3c1b12430c7e1f892ac6bccd1c1 (diff) | |
| download | nixlib-353d4508672f05965835f7122b1551f08472776c.tar nixlib-353d4508672f05965835f7122b1551f08472776c.tar.gz nixlib-353d4508672f05965835f7122b1551f08472776c.tar.bz2 nixlib-353d4508672f05965835f7122b1551f08472776c.tar.lz nixlib-353d4508672f05965835f7122b1551f08472776c.tar.xz nixlib-353d4508672f05965835f7122b1551f08472776c.tar.zst nixlib-353d4508672f05965835f7122b1551f08472776c.zip | |
* wrapPythonPrograms: don't hard-code the Python library prefix.
svn path=/nixpkgs/branches/modular-python/; revision=26594
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/trivial-builders.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 1998d91d1260..5defdb55b959 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -45,13 +45,15 @@ rec { # Make a package that just contains a setup hook with the given contents. - makeSetupHook = deps: script: - runCommand "hook" { } + makeSetupHook = { deps ? [], substitutions ? {} }: script: + runCommand "hook" substitutions ('' 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 + '' + stdenv.lib.optionalString (substitutions != {}) '' + substituteAll ${script} $out/nix-support/setup-hook ''); |