diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2008-06-12 15:59:59 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2008-06-12 15:59:59 +0000 |
| commit | 0784550c35e0b0e53b0b5ae6957d708102bb17a7 (patch) | |
| tree | ec0758c1a2a63010ed86e9fad8d9befd69ab4b23 /pkgs/top-level/builder-defs.nix | |
| parent | 638f4bf12179a025856f29a512252bc04370c736 (diff) | |
| download | nixlib-0784550c35e0b0e53b0b5ae6957d708102bb17a7.tar nixlib-0784550c35e0b0e53b0b5ae6957d708102bb17a7.tar.gz nixlib-0784550c35e0b0e53b0b5ae6957d708102bb17a7.tar.bz2 nixlib-0784550c35e0b0e53b0b5ae6957d708102bb17a7.tar.lz nixlib-0784550c35e0b0e53b0b5ae6957d708102bb17a7.tar.xz nixlib-0784550c35e0b0e53b0b5ae6957d708102bb17a7.tar.zst nixlib-0784550c35e0b0e53b0b5ae6957d708102bb17a7.zip | |
Added ViewMTN and dependency; currently ViewMTN has to be manually symlinked in corresponding directory.
svn path=/nixpkgs/trunk/; revision=12060
Diffstat (limited to 'pkgs/top-level/builder-defs.nix')
| -rw-r--r-- | pkgs/top-level/builder-defs.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/top-level/builder-defs.nix index 837ca0c0f8b7..112f6b5c2ffe 100644 --- a/pkgs/top-level/builder-defs.nix +++ b/pkgs/top-level/builder-defs.nix @@ -307,10 +307,15 @@ args: with args; with stringsWithDeps; with lib; wrapBinContentsPython = (makeManyWrappers ''$out/bin/*'' - (''--prefix PYTHONPATH : $(toPythonPath $out)'' + - ''''${PYTHONPATH:+ --prefix PYTHONPATH : $PYTHONPATH}'') + pythonWrapperArguments ); + pythonWrapperArguments = + (''--prefix PYTHONPATH : $(toPythonPath $out)'' + + ''''${PYTHONPATH:+ --prefix PYTHONPATH : $PYTHONPATH}''); + + preservePathWrapperArguments = ''''${PATH:+ --prefix PATH : $PATH }''; + doPropagate = FullDepEntry (" ensureDir \$out/nix-support echo '${toString (getAttr ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs @@ -507,4 +512,8 @@ args: with args; with stringsWithDeps; with lib; patchShebangFun; '') ["minInit"]; + createPythonInstallationTarget = FullDepEntry ('' + ensureDir $(toPythonPath $out) + export PYTHONPATH=$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath $out) + '') ["minInit" "addInputs" "defEnsureDir"]; }) // args |