Merge pull request #48566 from Lassulus/vbam
vbam: unstable-2017-09-04 -> 2.1.0
This commit is contained in:
commit
d8c89f49a6
@ -4,25 +4,23 @@
|
||||
, fetchFromGitHub
|
||||
, ffmpeg
|
||||
, gettext
|
||||
, gtk2-x11
|
||||
, libGLU_combined
|
||||
, openal
|
||||
, pkgconfig
|
||||
, SDL2
|
||||
, sfml
|
||||
, wxGTK
|
||||
, zip
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "visualboyadvance-m-${version}";
|
||||
version = "unstable-2017-09-04";
|
||||
version = "2.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "visualboyadvance-m";
|
||||
repo = "visualboyadvance-m";
|
||||
rev = "ceef480";
|
||||
sha256 = "1lpmlj8mv6fwlfg9m58hzggx8ld6cnjvaqx5ka5sffxd9v95qq2l";
|
||||
rev = "v${version}";
|
||||
sha256 = "1dppfvy24rgg3h84gv33l1y7zznkv3zxn2hf98w85pca6k1y2afz";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -30,13 +28,11 @@ stdenv.mkDerivation rec {
|
||||
cmake
|
||||
ffmpeg
|
||||
gettext
|
||||
gtk2-x11
|
||||
libGLU_combined
|
||||
openal
|
||||
pkgconfig
|
||||
SDL2
|
||||
sfml
|
||||
wxGTK
|
||||
zip
|
||||
zlib
|
||||
];
|
||||
@ -44,8 +40,10 @@ stdenv.mkDerivation rec {
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE='Release'"
|
||||
"-DENABLE_FFMPEG='true'"
|
||||
#"-DENABLE_LINK='true'" currently broken :/
|
||||
"-DENABLE_LINK='true'"
|
||||
"-DSYSCONFDIR=etc"
|
||||
"-DENABLE_WX='false'"
|
||||
"-DENABLE_SDL='true'"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
Loading…
Reference in New Issue
Block a user