cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #71981 from Lassulus/vbam

Browse source 
vbam: 2.1.3 -> 2.1.4
This commit is contained in:
Alexey Shmalko 2019-10-26 15:17:18 +03:00 committed by GitHub
commit b3675878af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/misc/emulators/vbam/default.nix
View file

@ -15,12 +15,12 @@
stdenv.mkDerivation rec {
pname = "visualboyadvance-m";
version = "2.1.3";
version = "2.1.4";
src = fetchFromGitHub {
owner = "visualboyadvance-m";
repo = "visualboyadvance-m";
rev = "v${version}";
sha256 = "0ibpn05jm6zvvrjyxbmh8qwm1qd26v0dzq45cp233ksvapw1h77h";
sha256 = "1kgpbvng3c12ws0dy92zc0azd94h0i3j4vm7b67zc8mi3pqsppdg";
};
nativeBuildInputs = [ cmake pkgconfig ];
@ -46,11 +46,12 @@ stdenv.mkDerivation rec {
"-DENABLE_SDL='true'"
];
meta = {
meta = with stdenv.lib; {
description = "A merge of the original Visual Boy Advance forks";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.lassulus ];
license = licenses.gpl2;
maintainers = with maintainers; [ lassulus ];
homepage = http://vba-m.com/;
platforms = stdenv.lib.platforms.linux;
badPlatforms = [ "aarch64-linux" ];
};
}

2
pkgs/top-level/all-packages.nix
View file

@ -24810,7 +24810,7 @@ in
vazir-fonts = callPackage ../data/fonts/vazir-fonts { };
vbam = callPackage ../misc/emulators/vbam {
ffmpeg = ffmpeg_2;
ffmpeg = ffmpeg_4;
};
vice = callPackage ../misc/emulators/vice {