colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ares: 129 -> 130.1

Browse Source
This commit is contained in:
AndersonTorres 2022-11-13 22:47:06 -03:00
parent f35f6ff9f9
commit 0b7f7b954d
4 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/applications/emulators/bsnes/ares/dont-rebuild-on-install.patch → pkgs/applications/emulators/bsnes/ares/000-dont-rebuild-on-install.patch
View File

24
pkgs/applications/emulators/bsnes/ares/001-fix-ruby.patch Normal file
View File

@ -0,0 +1,24 @@
diff -Naur source-old/ruby/GNUmakefile source-new/ruby/GNUmakefile
--- source-old/ruby/GNUmakefile 1969-12-31 21:00:01.000000000 -0300
+++ source-new/ruby/GNUmakefile 2022-11-13 22:43:09.700197748 -0300
@@ -11,17 +11,9 @@
ruby += audio.openal
ruby += input.quartz #input.carbon
else ifeq ($(platform),linux)
- pkg_check = $(if $(shell pkg-config $1 && echo 1),$2)
- ruby += video.glx video.glx2 video.xshm
- ruby += $(call pkg_check,xv,video.xvideo)
- ruby += audio.oss audio.alsa
- ruby += $(call pkg_check,openal,audio.openal)
- ruby += $(call pkg_check,libpulse,audio.pulseaudio)
- ruby += $(call pkg_check,libpulse-simple,audio.pulseaudiosimple)
- ruby += $(call pkg_check,ao,audio.ao)
- ruby += input.xlib
- ruby += $(call pkg_check,libudev,input.udev)
- ruby += $(call pkg_check,sdl2,input.sdl)
+ ruby += video.glx video.glx2 video.xshm video.xvideo
+ ruby += audio.oss audio.alsa audio.openal audio.pulseaudio audio.pulseaudiosimple audio.ao
+ ruby += input.xlib input.udev input.sdl
else ifeq ($(platform),bsd)
pkg_check = $(if $(shell pkg-config $1 && echo 1),$2)
ruby += video.glx video.glx2 video.xshm

16
pkgs/applications/emulators/bsnes/ares/default.nix
View File

@ -17,20 +17,20 @@
, udev
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "ares";
version = "129";
version = "130.1";
src = fetchFromGitHub {
owner = "ares-emulator";
repo = "ares";
rev = "v${version}";
hash = "sha256-prfvoGtbnsl/1ahx98jBOgT64W566GoUtE8rIOF7lYc=";
rev = "v${finalAttrs.version}";
hash = "sha256-q2wDpbNaDyKPBL20FDaHScKQEJYstlQdJ4CzbRoSPlk=";
};
patches = [
./dont-rebuild-on-install.patch
./fix-ruby.patch
./000-dont-rebuild-on-install.patch
./001-fix-ruby.patch
];
nativeBuildInputs = [
@ -64,12 +64,12 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
homepage = "https://ares.dev";
homepage = "https://ares-emu.net";
description = "Open-source multi-system emulator with a focus on accuracy and preservation";
license = licenses.isc;
maintainers = with maintainers; [ Madouura AndersonTorres ];
platforms = platforms.linux;
};
}
})
# TODO: select between Qt, GTK2 and GTK3
# TODO: support Darwin

27
pkgs/applications/emulators/bsnes/ares/fix-ruby.patch
View File

@ -1,27 +0,0 @@
diff --git a/ruby/GNUmakefile b/ruby/GNUmakefile
index e85a51701..7fca89e0f 100644
--- a/ruby/GNUmakefile
+++ b/ruby/GNUmakefile
@@ -8,19 +8,9 @@ ifeq ($(ruby),)
ruby += audio.openal
ruby += input.quartz #input.carbon
else ifeq ($(platform),linux)
- pkg_check1 = $(if $(shell test -e /usr/lib/lib$1.so && echo 1),$2)
- pkg_check2 = $(if $(shell test -e /usr/lib/$(shell uname -m)-linux-gnu/lib$1.so && echo 1),$2)
- pkg_check = $(call pkg_check1,$1,$2) $(call pkg_check2,$1,$2)
- ruby += video.glx video.glx2 video.xshm
- ruby += $(call pkg_check,Xv,video.xvideo)
- ruby += audio.oss audio.alsa
- ruby += $(call pkg_check,openal,audio.openal)
- ruby += $(call pkg_check,pulse,audio.pulseaudio)
- ruby += $(call pkg_check,pulse-simple,audio.pulseaudiosimple)
- ruby += $(call pkg_check,ao,audio.ao)
- ruby += input.xlib
- ruby += $(call pkg_check,udev,input.udev)
- ruby += $(call pkg_check,SDL2,input.sdl)
+ ruby += video.glx video.glx2 video.xshm video.xvideo
+ ruby += audio.oss audio.alsa audio.openal audio.pulseaudio audio.pulseaudiosimple audio.ao
+ ruby += input.xlib input.udev input.sdl
else ifeq ($(platform),bsd)
pkg_check = $(if $(shell test -e /usr/local/lib/lib$1.so && echo 1),$2)
ruby += video.glx video.glx2 video.xshm