scummvm: 2.5.1 -> 2.6.1
This commit is contained in:
parent
dc0c7a8b9c
commit
97e489feea
1 changed files with 9 additions and 8 deletions
|
@ -1,15 +1,17 @@
|
|||
{ lib, stdenv, fetchurl, nasm
|
||||
, alsa-lib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU, libGL, SDL2, zlib
|
||||
{ lib, stdenv, fetchFromGitHub, nasm
|
||||
, alsa-lib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libtheora, libvorbis, libGLU, libGL, SDL2, zlib
|
||||
, Cocoa, AudioToolbox, Carbon, CoreMIDI, AudioUnit, cctools
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "scummvm";
|
||||
version = "2.5.1";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://scummvm.org/frs/scummvm/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-n9jbOORFYUS/jDTazffyBOdfGOjkSOwBzgjOgmoDXwE=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "scummvm";
|
||||
repo = "scummvm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fqMMdHBVcXLsBDWxXH9UKXwfvlyIVbRsIPmrYqPGQ+g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ nasm ];
|
||||
|
@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Cocoa AudioToolbox Carbon CoreMIDI AudioUnit
|
||||
] ++ [
|
||||
curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libvorbis libGLU libGL SDL2 zlib
|
||||
curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libtheora libvorbis libGLU libGL SDL2 zlib
|
||||
];
|
||||
|
||||
dontDisableStatic = true;
|
||||
|
@ -28,7 +30,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configurePlatforms = [ "host" ];
|
||||
configureFlags = [
|
||||
"--enable-c++11"
|
||||
"--enable-release"
|
||||
];
|
||||
|
||||
|
|
Loading…
Reference in a new issue