diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-08 20:48:14 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-08 20:48:14 +0200 |
| commit | febd5e323d08db5912e33d247a5f12275277dfb6 (patch) | |
| tree | f50a941c9a2b6b52983d12ea371ad2118b058e42 /pkgs/misc | |
| parent | 0061fae2e6fd62f6d2a76418b62815bd49add51c (diff) | |
| parent | e9183fd2d4d3bb222b2ce3492935ec26d207524a (diff) | |
| download | nixlib-febd5e323d08db5912e33d247a5f12275277dfb6.tar nixlib-febd5e323d08db5912e33d247a5f12275277dfb6.tar.gz nixlib-febd5e323d08db5912e33d247a5f12275277dfb6.tar.bz2 nixlib-febd5e323d08db5912e33d247a5f12275277dfb6.tar.lz nixlib-febd5e323d08db5912e33d247a5f12275277dfb6.tar.xz nixlib-febd5e323d08db5912e33d247a5f12275277dfb6.tar.zst nixlib-febd5e323d08db5912e33d247a5f12275277dfb6.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/vbam/default.nix | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix index 8ef64a11a177..9f1cbdf39089 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/misc/emulators/vbam/default.nix @@ -1,9 +1,10 @@ { stdenv , cairo , cmake -, fetchsvn +, fetchFromGitHub , ffmpeg , gettext +, gtk2-x11 , libpng , libpthreadstubs , libXdmcp @@ -11,18 +12,21 @@ , mesa , openal , pkgconfig -, SDL +, SDL2 +, sfml , wxGTK , zip , zlib }: -stdenv.mkDerivation { - name = "VBAM-1507"; - src = fetchsvn { - url = "svn://svn.code.sf.net/p/vbam/code/trunk"; - rev = 1507; - sha256 = "0fqvgi5s0sacqr9yi7kv1klqlvfzr13sjq5ikipirz0jv50kjxa7"; +stdenv.mkDerivation rec { + name = "visualboyadvance-m-${version}"; + version = "unstable-2017-09-04"; + src = fetchFromGitHub { + owner = "visualboyadvance-m"; + repo = "visualboyadvance-m"; + rev = "ceef480"; + sha256 = "1lpmlj8mv6fwlfg9m58hzggx8ld6cnjvaqx5ka5sffxd9v95qq2l"; }; buildInputs = [ @@ -30,14 +34,12 @@ stdenv.mkDerivation { cmake ffmpeg gettext - libpng - libpthreadstubs - libXdmcp - libxshmfence + gtk2-x11 mesa openal pkgconfig - SDL + SDL2 + sfml wxGTK zip zlib |