diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-28 12:20:59 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-28 12:20:59 +0100 |
| commit | 57ddc155fcdb5a419860dd4a6ed03deabcc162f2 (patch) | |
| tree | eb44f417d88b209821f8c8522eac90af195a8302 /pkgs/games/scummvm | |
| parent | ed01e0ca4f57d8abc8fbb16f7387a4f553d3fc8a (diff) | |
| parent | f0da094b2e2e885e4c2ea7930583c6fa302add0f (diff) | |
Merge branch 'master' into staging
Conflicts: pkgs/games/scummvm/default.nix
Diffstat (limited to 'pkgs/games/scummvm')
| -rw-r--r-- | pkgs/games/scummvm/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 91c3114694b7f..603e0b0e9e4ea 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -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" ]; |