summary refs log tree commit diff
path: root/pkgs/misc/emulators
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-10-16 16:25:43 +0200
committerlassulus <lassulus@lassul.us>2018-10-16 16:26:20 +0200
commitaac680d4c97cce08ce759043dd25a3efd5d9b5dd (patch)
tree5a195c3801d04cf2907b1f629bdc609ae2d152f9 /pkgs/misc/emulators
parente31942c71eef88a7188acc36b00c2a916d8774e6 (diff)
downloadnixpkgs-aac680d4c97cce08ce759043dd25a3efd5d9b5dd.tar
nixpkgs-aac680d4c97cce08ce759043dd25a3efd5d9b5dd.tar.gz
nixpkgs-aac680d4c97cce08ce759043dd25a3efd5d9b5dd.tar.bz2
nixpkgs-aac680d4c97cce08ce759043dd25a3efd5d9b5dd.tar.lz
nixpkgs-aac680d4c97cce08ce759043dd25a3efd5d9b5dd.tar.xz
nixpkgs-aac680d4c97cce08ce759043dd25a3efd5d9b5dd.tar.zst
nixpkgs-aac680d4c97cce08ce759043dd25a3efd5d9b5dd.zip
vbam: unstable-2017-09-04 -> 2.1.0
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r--pkgs/misc/emulators/vbam/default.nix14
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix
index ac078f62251..59f0252259c 100644
--- a/pkgs/misc/emulators/vbam/default.nix
+++ b/pkgs/misc/emulators/vbam/default.nix
@@ -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 = {