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

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

Browse Source
This commit is contained in:
Austin Horstman
2025-10-24 03:47:05 +00:00
committed by GitHub
parent e56c8c71d8 ee59f88196
commit 51db701635
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch
+15
View File
@@ -0,0 +1,15 @@
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
View File
@@ -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