diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/builder-defs.nix | 6 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92b103a28b264..236b4a1576990 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4138,6 +4138,15 @@ let pkgs = rec { propagatedBuildInputs = []; }; + perlYAML = import ../development/perl-modules/generic perl { + name = "YAML-0.66"; + src = fetchurl { + url = http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-0.66.tar.gz; + sha256 = "1pcjf6y3l88ypa52mkk349jglabm53mhxda4p5awc1jl67lx3ngw"; + }; + propagatedBuildInputs = []; + }; + perlYAMLSyck = import ../development/perl-modules/generic perl { name = "YAML-Syck-1.04"; src = fetchurl { @@ -6298,6 +6307,7 @@ let pkgs = rec { tailor = builderDefsPackage (selectVersion ../applications/version-management/tailor "0.9.31") { python = python25; + inherit makeWrapper; } null; /* does'nt work yet i686-linux only (32bit version) diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/top-level/builder-defs.nix index b847a99c141d4..e016997676855 100644 --- a/pkgs/top-level/builder-defs.nix +++ b/pkgs/top-level/builder-defs.nix @@ -305,6 +305,12 @@ args: with args; with stringsWithDeps; with lib; done '') ["minInit" "addInputs" "defEnsureDir"]; + wrapBinContentsPython = (makeManyWrappers + ''$out/bin/*'' + (''--prefix PYTHONPATH : $(toPythonPath $out)'' + + ''''${PYTHONPATH:+ --prefix PYTHONPATH : $PYTHONPATH}'') + ); + doPropagate = FullDepEntry (" ensureDir \$out/nix-support echo '${toString (getAttr ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs |