Merge remote-tracking branch 'upstream/master' into hardened-stdenv

pkgs/misc/emulators/dosbox/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL, makeDesktopItem }:
+{ stdenv, fetchurl, SDL, makeDesktopItem, mesa }:
 
 stdenv.mkDerivation rec { 
   name = "dosbox-0.74";
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
 
   patchFlags = "-p0";
 
-  buildInputs = [ SDL ];
-
   hardeningDisable = [ "format" ];
 
+  buildInputs = [ SDL mesa ];
+
   desktopItem = makeDesktopItem {
     name = "dosbox";
     exec = "dosbox";