diff --git a/pkgs/applications/emulators/vbam/default.nix b/pkgs/applications/emulators/vbam/default.nix index bb5e7cea4e00..c641c58dd6bc 100644 --- a/pkgs/applications/emulators/vbam/default.nix +++ b/pkgs/applications/emulators/vbam/default.nix @@ -5,6 +5,8 @@ , fetchpatch , ffmpeg , gettext +, wxGTK32 +, gtk3 , libGLU, libGL , openal , pkg-config @@ -16,12 +18,12 @@ stdenv.mkDerivation rec { pname = "visualboyadvance-m"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "visualboyadvance-m"; repo = "visualboyadvance-m"; rev = "v${version}"; - sha256 = "1kgpbvng3c12ws0dy92zc0azd94h0i3j4vm7b67zc8mi3pqsppdg"; + sha256 = "1sc3gdn7dqkipjsvlzchgd98mia9ic11169dw8v341vr9ppb1b6m"; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -30,12 +32,15 @@ stdenv.mkDerivation rec { cairo ffmpeg gettext - libGLU libGL + libGLU + libGL openal SDL2 sfml zip zlib + wxGTK32 + gtk3 ]; cmakeFlags = [ @@ -43,19 +48,9 @@ stdenv.mkDerivation rec { "-DENABLE_FFMPEG='true'" "-DENABLE_LINK='true'" "-DSYSCONFDIR=etc" - "-DENABLE_WX='false'" "-DENABLE_SDL='true'" ]; - patches = [ - (fetchpatch { - # https://github.com/visualboyadvance-m/visualboyadvance-m/pull/793 - name = "fix-build-SDL-2.0.14.patch"; - url = "https://github.com/visualboyadvance-m/visualboyadvance-m/commit/619a5cce683ec4b1d03f08f316ba276d8f8cd824.patch"; - sha256 = "099cbzgq4r9g83bvdra8a0swfl1vpfng120wf4q7h6vs0n102rk9"; - }) - ]; - meta = with lib; { description = "A merge of the original Visual Boy Advance forks"; license = licenses.gpl2;