gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

melonDS: drop qt 6.10 patch (#455193)

Browse Source
This commit is contained in:
Aleksana
2025-11-09 03:08:36 +00:00
committed by GitHub
parent f780f1f7c7 e0472106fd
commit 3045f43481
2 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,15 +0,0 @@
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)

2
pkgs/by-name/me/melonDS/package.nix
View File

@@ -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