Unverified Commit 3045f434 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

melonDS: drop qt 6.10 patch (#455193)

parents f780f1f7 e0472106

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

deleted100644 → 0
+0 −15
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

+0 −2
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-Vnrg+6fSnzQKy+3ZU6LKSkkgc04H9KPsE/M2Iu9Wudw=";

  };



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



  nativeBuildInputs = [

    cmake

    extra-cmake-modules