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

Merge pull request #48566 from Lassulus/vbam

Browse Source 
vbam: unstable-2017-09-04 -> 2.1.0
This commit is contained in:
Jörg Thalheim 2018-10-16 16:10:37 +01:00 committed by GitHub
commit d8c89f49a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/misc/emulators/vbam/default.nix
View File

@ -4,25 +4,23 @@
, fetchFromGitHub , fetchFromGitHub
, ffmpeg , ffmpeg
, gettext , gettext
, gtk2-x11
, libGLU_combined , libGLU_combined
, openal , openal
, pkgconfig , pkgconfig
, SDL2 , SDL2
, sfml , sfml
, wxGTK
, zip , zip
, zlib , zlib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "visualboyadvance-m-${version}"; name = "visualboyadvance-m-${version}";
version = "unstable-2017-09-04"; version = "2.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "visualboyadvance-m"; owner = "visualboyadvance-m";
repo = "visualboyadvance-m"; repo = "visualboyadvance-m";
rev = "ceef480"; rev = "v${version}";
sha256 = "1lpmlj8mv6fwlfg9m58hzggx8ld6cnjvaqx5ka5sffxd9v95qq2l"; sha256 = "1dppfvy24rgg3h84gv33l1y7zznkv3zxn2hf98w85pca6k1y2afz";
}; };
buildInputs = [ buildInputs = [
@ -30,13 +28,11 @@ stdenv.mkDerivation rec {
cmake cmake
ffmpeg ffmpeg
gettext gettext
gtk2-x11
libGLU_combined libGLU_combined
openal openal
pkgconfig pkgconfig
SDL2 SDL2
sfml sfml
wxGTK
zip zip
zlib zlib
]; ];
@ -44,8 +40,10 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE='Release'" "-DCMAKE_BUILD_TYPE='Release'"
"-DENABLE_FFMPEG='true'" "-DENABLE_FFMPEG='true'"
#"-DENABLE_LINK='true'" currently broken :/ "-DENABLE_LINK='true'"
"-DSYSCONFDIR=etc" "-DSYSCONFDIR=etc"
"-DENABLE_WX='false'"
"-DENABLE_SDL='true'"
]; ];
meta = { meta = {