merge the rest of multiple-outputs

Conflicts:
	pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken)
	pkgs/development/tools/misc/patchelf/default.nix (easy)
	pkgs/stdenv/generic/setup.sh (previous merge taken)
This commit is contained in:
Vladimír Čunát
2014-08-25 10:41:49 +02:00
56 changed files with 398 additions and 102 deletions
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
setupHook = [ ./setup-hook.sh ];
doCheck = true;
meta = {
homepage = http://nixos.org/patchelf.html;
license = "GPL";