Unverified Commit 51db7016 authored by Austin Horstman's avatar Austin Horstman Committed by GitHub
Browse files

melonDS: 1.0-unstable-2025-08-10 -> 1.0-unstable-2025-10-13; melonDS: fix... 

melonDS: 1.0-unstable-2025-08-10 -> 1.0-unstable-2025-10-13; melonDS: fix build with Qt 6.10 (#454953)
parents e56c8c71 ee59f881

pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch

0 → 100644
+15 −0
Original line number Diff line number Diff line 
diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt

index 1afa856f..dcd36f84 100644

--- a/src/frontend/qt_sdl/CMakeLists.txt

+++ b/src/frontend/qt_sdl/CMakeLists.txt

@@ -65,6 +65,10 @@ option(USE_QT6 "Use Qt 6 instead of Qt 5" ON)

 if (USE_QT6)

     find_package(Qt6 COMPONENTS Core Gui Widgets Network Multimedia OpenGL OpenGLWidgets Svg REQUIRED)

     set(QT_LINK_LIBS Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Network Qt6::Multimedia Qt6::OpenGL Qt6::OpenGLWidgets)

+    if(Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10")

+        find_package(Qt6 COMPONENTS GuiPrivate REQUIRED)

+        list(APPEND QT_LINK_LIBS Qt6::GuiPrivate)

+    endif()

 else()

     find_package(Qt5 COMPONENTS Core Gui Widgets Network Multimedia Svg REQUIRED)

     set(QT_LINK_LIBS Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia)

pkgs/by-name/me/melonDS/package.nix

+7 −3
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
  enet,

  extra-cmake-modules,

  fetchFromGitHub,

  faad2,

  libGL,

  libarchive,

  libpcap,
@@ -28,15 +29,17 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "melonDS";

  version = "1.0-unstable-2025-08-10";

  version = "1.0-unstable-2025-10-13";



  src = fetchFromGitHub {

    owner = "melonDS-emu";

    repo = "melonDS";

    rev = "f9e46fdc29f8e55aca6bc121c424890faee2e51d";

    hash = "sha256-g5TVvnCoWQej9v2aii5klx7gRzUrokiwy0By0G3LkiI=";

    rev = "91ab68090c0aa588aabaeaa5e2c62564fd661ccc";

    hash = "sha256-04Wr7xUwz6Q9JDiEfTQh6Vx5q71dFVI9rScIpt6ywGY=";

  };



  patches = [ ./fix-build-qt-6.10.patch ];



  nativeBuildInputs = [

    cmake

    extra-cmake-modules
@@ -47,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { 
  buildInputs = [

    SDL2

    enet

    faad2

    libarchive

    libslirp

    libGL