From 3802a1d38b5e524f26f893674995f46e15fbaca8 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sat, 29 Oct 2022 07:14:00 +0200 Subject: [PATCH 1/2] rgbds: 0.5.2 -> 0.6.0 --- pkgs/development/compilers/rgbds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index 0d076f0cfae3..955635d3f84c 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "gbdev"; repo = "rgbds"; rev = "v${version}"; - sha256 = "sha256-/GjxdB3Nt+XuKKQWjU12mS91U4FFoeP+9t0L+HsB/o8="; + sha256 = "sha256-2nyjI6z6W959/Yc8EwdQVmGnG0PKwsndPLmeDlNpj18="; }; nativeBuildInputs = [ bison flex pkg-config ]; buildInputs = [ libpng ]; From bfd9577640a6da76f18a4946c43ee531c6c7072e Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sat, 29 Oct 2022 07:14:34 +0200 Subject: [PATCH 2/2] sameboy: add rgbds 0.6 compatibility --- pkgs/applications/emulators/sameboy/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/emulators/sameboy/default.nix b/pkgs/applications/emulators/sameboy/default.nix index 26555acb61cb..6ae3d141b399 100644 --- a/pkgs/applications/emulators/sameboy/default.nix +++ b/pkgs/applications/emulators/sameboy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook, glib }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook, glib }: stdenv.mkDerivation rec { pname = "sameboy"; @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ rgbds glib wrapGAppsHook ]; buildInputs = [ SDL2 ]; + patches = [ + (fetchpatch { + url = "https://github.com/LIJI32/SameBoy/commit/c0966ceebaf1cf2518427ffa3c0189d8f96ab5aa.patch"; + hash = "sha256-2o/aWimtAKqay7SGq5Q9vLDcQKqV6Bn2xJtnjACrLUw="; + }) + ]; + makeFlags = [ "CONF=release" "FREEDESKTOP=true"