From 92702bef0b49be065dfeb947b75f704b2ec599d7 Mon Sep 17 00:00:00 2001 From: sugar Date: Sat, 10 Aug 2024 14:29:46 +0200 Subject: [PATCH 1/3] snes9x: fix EGL loading in Wayland --- pkgs/by-name/sn/snes9x/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/sn/snes9x/package.nix b/pkgs/by-name/sn/snes9x/package.nix index e125d3ee9eb9..6ec18abc50ec 100644 --- a/pkgs/by-name/sn/snes9x/package.nix +++ b/pkgs/by-name/sn/snes9x/package.nix @@ -5,6 +5,7 @@ cmake, fetchFromGitHub, gtkmm3, + libGL, libX11, libXdmcp, libXext, @@ -87,6 +88,13 @@ stdenv.mkDerivation (finalAttrs: { "--enable-avx2" ]; + postPatch = '' + substituteInPlace external/glad/src/egl.c \ + --replace-fail libEGL.so.1 "${lib.getLib libGL}/lib/libEGL.so.1" + substituteInPlace external/glad/src/glx.c \ + --replace-fail libGL.so.1 ${lib.getLib libGL}/lib/libGL.so.1 + ''; + preConfigure = '' cd ${if withGtk then "gtk" else "unix"} ''; From b0254b1665939cac917be28fcd18ff9239926373 Mon Sep 17 00:00:00 2001 From: sugar Date: Sat, 10 Aug 2024 14:30:02 +0200 Subject: [PATCH 2/3] maintainers: add sugar700 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b44edb087bf3..403afa1a3890 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19717,6 +19717,12 @@ githubId = 32478597; name = "Subin Kim"; }; + sugar700 = { + email = "sugar@sylveon.social"; + github = "sugar700"; + githubId = 168804988; + name = "sugar"; + }; suhr = { email = "suhr@i2pmail.org"; github = "suhr"; From 93ff6d1bb93440dd9d8f3947d49873fb2b459cac Mon Sep 17 00:00:00 2001 From: sugar Date: Sat, 10 Aug 2024 14:31:11 +0200 Subject: [PATCH 3/3] snes9x: add sugar700 to maintainer list --- pkgs/by-name/sn/snes9x/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/sn/snes9x/package.nix b/pkgs/by-name/sn/snes9x/package.nix index 6ec18abc50ec..1888a2df4186 100644 --- a/pkgs/by-name/sn/snes9x/package.nix +++ b/pkgs/by-name/sn/snes9x/package.nix @@ -134,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: { AndersonTorres qknight thiagokokada + sugar700 ]; platforms = lib.platforms.unix; broken = (withGtk && stdenv.isDarwin);