Merge branch 'staging' into v/modular

Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix

pkgs/misc/emulators/emulationstation/default.nix

@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, cmake, boost, eigen, freeimage, freetype
+, mesa, SDL, dejavu_fonts }:
+
+stdenv.mkDerivation rec {
+  name = "emulationstation-${version}";
+  version = "1.0.2";
+  src = fetchurl {
+    url = "https://github.com/Aloshi/EmulationStation/archive/v${version}.tar.gz";
+    sha256 = "809d67aaa727809c1426fb543e36bb788ca6a3404f8c46dd1917088b57ab5f50";
+  };
+
+  buildInputs = [ pkgconfig cmake boost eigen freeimage freetype mesa SDL ];
+
+  prePatch = ''
+    sed -i \
+      -e 's,/usr\(.*\)/ttf-dejavu\(.*\),${dejavu_fonts}\1\2,' src/Font.cpp
+  '';
+
+  buildPhase = "cmake . && make";
+  installPhase = ''
+    mkdir -p $out/bin
+    mv ../emulationstation $out/bin/.
+  '';
+
+  meta = {
+    description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes";
+    homepage = "http://emulationstation.org";
+    maintainers = [ stdenv.lib.maintainers.edwtjo ];
+    license = stdenv.lib.licenses.mit;
+  };
+}

pkgs/misc/emulators/ppsspp/default.nix

@@ -3,15 +3,15 @@
 }:
 
 let
-  version = "0.9.9";
+  version = "0.9.9.1";
   fstat = x: fn: "-D" + fn + "=" + (if x then "ON" else "OFF");
 in stdenv.mkDerivation {
   name = "PPSSPP-${version}";
 
   src = fetchgit {
     url = "https://github.com/hrydgard/ppsspp.git";
-    sha256 = "1m7awac87wrwys22qwbr0589im1ilm0dv30wp945xg30793rivvj";
-    rev = "b421e29391b34d997b2c99ce2bdc74a0df5bb472";
+    sha256 = "0fdbda0b4dfbecacd01850f1767e980281fed4cc34a21df26ab3259242d8c352";
+    rev = "bf709790c4fed9cd211f755acaa650ace0f7555a";
     fetchSubmodules = true;
   };
 
@@ -19,7 +19,7 @@ in stdenv.mkDerivation {
                 ++ (if withGamepads then [ SDL ] else [ ]);
 
   configurePhase = "cd Qt && qmake PPSSPPQt.pro";
-  installPhase = "mkdir -p $out/bin && cp PPSSPPQt $out/bin";
+  installPhase = "mkdir -p $out/bin && cp ppsspp $out/bin";
 
   meta = with stdenv.lib; {
     homepage = "http://www.ppsspp.org/";

pkgs/misc/ghostscript/default.nix

@@ -12,7 +12,7 @@ assert cupsSupport -> cups != null;
 let
   meta_common = {
     homepage = "http://www.gnu.org/software/ghostscript/";
-    description = "GNU Ghostscript, a PostScript interpreter";
+    description = "PostScript interpreter (GNU version)";
 
     longDescription = ''
       Ghostscript is the name of a set of tools that provides (i) an
@@ -48,7 +48,7 @@ let
     };
     meta = meta_common // {
       homepage = "http://www.ghostscript.com/";
-      description = "GPL Ghostscript, a PostScript interpreter";
+      description = "PostScript interpreter (mainline version)";
     };
 
     preConfigure = ''

pkgs/misc/xosd/default.nix

@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ libX11 libXext libXt xextproto xproto ];
 
   meta = {
-    description = "XOSD displays text on your screen";
+    description = "Displays text on your screen";
   };
 }