Merge pull request #201121 from atorres1985-contrib/misc-updates (9347608e) · Commits · nix / nixpkgs

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

+0 −0

File moved.

pkgs/applications/emulators/bsnes/ares/fix-ruby.patch→pkgs/applications/emulators/bsnes/ares/001-fix-ruby.patch

+24 −0

Original line number	Diff line number	Diff line
		diff --git a/ruby/GNUmakefile b/ruby/GNUmakefile
		index e85a51701..7fca89e0f 100644
		--- a/ruby/GNUmakefile
		+++ b/ruby/GNUmakefile
		@@ -8,19 +8,9 @@ ifeq ($(ruby),)
		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_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)
		- 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 += $(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,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,udev,input.udev)
		- ruby += $(call pkg_check,SDL2,input.sdl)
		- 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 test -e /usr/local/lib/lib$1.so && echo 1),$2)
		pkg_check = $(if $(shell pkg-config $1 && echo 1),$2)
		ruby += video.glx video.glx2 video.xshm

pkgs/applications/emulators/bsnes/ares/default.nix

+8 −8

Original line number	Diff line number	Diff line
		@@ -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

pkgs/applications/emulators/desmume/default.nix

+7 −6

Original line number	Diff line number	Diff line
		@@ -21,15 +21,15 @@
		, zlib
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "desmume";
		version = "0.9.11+unstable=2021-09-22";
		version = "0.9.13";

		src = fetchFromGitHub {
		owner = "TASVideos";
		repo = pname;
		rev = "7fc2e4b6b6a58420de65a4089d4df3934d7a46b1";
		hash = "sha256-sTCyjQ31w1Lp+aa3VQ7/rdLbhjnqthce54mjKJZQIDM=";
		repo = "desmume";
		rev = "release_${lib.replaceChars ["."] ["_"] finalAttrs.version}";
		hash = "sha256-vmjKXa/iXLTwtqnG+ZUvOnOQPZROeMpfM5J3Jh/Ynfo=";
		};

		nativeBuildInputs = [
		@@ -81,7 +81,8 @@ stdenv.mkDerivation rec {
		license = licenses.gpl2Plus;
		maintainers = [ maintainers.AndersonTorres ];
		platforms = platforms.unix;
		broken = stdenv.isAarch64 && stdenv.isLinux; # ofborg failed
		};
		}
		})
		# TODO: investigate the patches
		# TODO: investigate other platforms

pkgs/applications/emulators/fceux/default.nix

+29 −9

Original line number	Diff line number	Diff line
		{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, SDL2, lua5_1, minizip, x264 }:
		{ lib
		, stdenv
		, fetchFromGitHub
		, SDL2
		, cmake
		, lua
		, minizip
		, pkg-config
		, wrapQtAppsHook
		, x264
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "fceux";
		version = "2.6.4";

		src = fetchFromGitHub {
		owner = "TASEmulators";
		repo = pname;
		rev = "${pname}-${version}";
		sha256 = "sha256-Q6r/iBlmi0z40+U6OLZCahS0io4IBBGZMP1mJH7szRM=";
		repo = "fceux";
		rev = "fceux-${finalAttrs.version}";
		hash = "sha256-Q6r/iBlmi0z40+U6OLZCahS0io4IBBGZMP1mJH7szRM=";
		};

		nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
		buildInputs = [ SDL2 lua5_1 minizip x264 ];
		nativeBuildInputs = [
		cmake
		pkg-config
		wrapQtAppsHook
		];

		buildInputs = [
		SDL2
		lua
		minizip
		x264
		];

		meta = with lib; {
		homepage = "http://www.fceux.com/";
		description = "A Nintendo Entertainment System (NES) Emulator";
		license = licenses.gpl2Plus;
		maintainers = with maintainers; [ sbruder scubed2 ];
		homepage = "http://www.fceux.com/";
		platforms = platforms.linux;
		};
		}
		})