After removing qt's dependency on the symlinked combination of mesa and glu,
many qt apps were missing it now (since e9f0d10).
I resove this to a compromise.
This is all work of Marc Weber <marco-oweber@gmx.de>, except for a few nitpicks.
Tested space blowup: IMHO negligible to headers and similar stuff,
e.g. the firefox closure (reported by du) grows from 560 to 579 MB.
Saving space should be handled separately,
e.g. we have the multiple-outputs branch.
Conflicts (a little tricky, I did some cleanup of interacting changes):
pkgs/development/compilers/llvm/default.nix
pkgs/development/libraries/libpng/default.nix
pkgs/tools/package-management/nixops/default.nix
pkgs/top-level/all-packages.nix
The sha256 was magically changed upstream with the same contents but
different timestamps, so let's update it. Thanks to @rbvermaa for
noticing.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Contains the following fix:
- Fix mounting btrfs when mount_only (-m) is used.
I would like to update blivet as well, but at the moment it breaks for
nixpart, so let's retry later when we're at 0.5.x or even 1.x :-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
It's bad to have the kernel config scattered across two places. (This
should also be done for the other architectures.)
Also, restore Xen and KVM guest support in Linux 3.10.
Having N different copies of the NixOS kernel configuration is bad
because these copies tend to diverge. For instance, our 3.10 config
lacked some modules that were enabled in older configs, probably
because the 3.10 config had been copied off an earlier version of some
older kernel config.
So now there is a single kernel config in common-config.nix. It has a
few conditionals to deal with new/removed kernel options, but
otherwise it's pretty straightforward.
Also, a lot of cut&paste boilerplate between the kernel Nix
expressions is gone (such as preConfigure).
Change PATH=$PATH:deps to PATH=deps:$PATH in the wicd wrappers, because
the latter is more deterministic; it prevents possibly wrong versions of
dependencies to sneak in from the environment.
Do the same for PYTHONPATH.
![](https://secure.gravatar.com/avatar/2f93d08a773b27d6548598c5f45aa3a9?d=identicon&s=56 "Jason \\"Don\\" O'Conal"){kind=small}
