diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-10-16 16:10:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-16 16:10:37 +0100 |
| commit | d8c89f49a6f942207727f59be6c502bf8b65373c (patch) | |
| tree | 59d3e81308ecb25b828db7eb3e19e6cf90c7e1a5 | |
| parent | 4b62dcfafae54be6f9a60a8da8e1dda80312aa24 (diff) | |
| parent | aac680d4c97cce08ce759043dd25a3efd5d9b5dd (diff) | |
| download | nixlib-d8c89f49a6f942207727f59be6c502bf8b65373c.tar nixlib-d8c89f49a6f942207727f59be6c502bf8b65373c.tar.gz nixlib-d8c89f49a6f942207727f59be6c502bf8b65373c.tar.bz2 nixlib-d8c89f49a6f942207727f59be6c502bf8b65373c.tar.lz nixlib-d8c89f49a6f942207727f59be6c502bf8b65373c.tar.xz nixlib-d8c89f49a6f942207727f59be6c502bf8b65373c.tar.zst nixlib-d8c89f49a6f942207727f59be6c502bf8b65373c.zip | |
Merge pull request #48566 from Lassulus/vbam
vbam: unstable-2017-09-04 -> 2.1.0
| -rw-r--r-- | pkgs/misc/emulators/vbam/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix index ac078f622515..59f0252259cc 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 = { |