Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv ...

In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix

2014-09-08 18:16:54 +02:00

..

default.nix

gstreamer: update to 1.4.0

2014-07-22 18:15:39 +08:00

setup-hook.sh

Cleanup: Use += to append to envHooks

2014-08-09 12:47:05 +02:00