public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source 
Conflicts:
	pkgs/games/scummvm/default.nix
This commit is contained in:
obadz
2016-08-28 12:20:59 +01:00
parent ed01e0ca4f f0da094b2e
commit 57ddc155fc
19 changed files with 150 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/games/scummvm/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib }:
{ stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib, mesa }:
stdenv.mkDerivation rec {
name = "scummvm-1.8.0";
@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/scummvm/${name}.tar.bz2";
sha256 = "0f3zgvz886lk9ps0v333aq74vx6grlx68hg14gfaxcvj55g73v01";
};
buildInputs = [ SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ];
buildInputs = [ SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib mesa ];
hardeningDisable = [ "format" ];