svn merge ^/nixpkgs/trunk

Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091

1 files changed, 5 insertions, 0 deletions

diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index d37f53ae5f51..eb5a51ae6eaa 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -89,5 +89,10 @@ gui = stdenv.mkDerivation {
     mkdir -pv $out/share/icons
     cp -av icons/hicolor $out/share/icons
   '';
+
+  meta = {
+    description = "Qt4 wpa_supplicant client";
+    inherit (qt4.meta) platforms;
+  };
 };
 }