From 68de652b96d0e829bb4765962a6bff4fc9d244c3 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 5 Jul 2024 09:13:18 -0300 Subject: [PATCH 1/2] melonDS: use qt6 libraries --- pkgs/by-name/me/melonDS/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 049f3f9695ec..9c403f5e3893 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -6,7 +6,6 @@ , libGL , libarchive , libpcap -, libsForQt5 , qt6 , libslirp , pkg-config @@ -17,8 +16,7 @@ }: let - qt = if stdenv.isLinux then libsForQt5 else qt6; - inherit (qt) + inherit (qt6) qtbase qtmultimedia wrapQtAppsHook; @@ -53,6 +51,10 @@ stdenv.mkDerivation (finalAttrs: { wayland ]; + cmakeFlags = [ + (lib.cmakeBool "USE_QT6" true) + ]; + strictDeps = true; qtWrapperArgs = lib.optionals stdenv.isLinux [ From 0821554d5ee2a0b98c6b674f28e4da5fc7eaffc5 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 4 Jul 2024 23:39:56 -0300 Subject: [PATCH 2/2] melonDS: reword input set --- pkgs/by-name/me/melonDS/package.nix | 31 +++++++++++++++-------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 9c403f5e3893..821dc4843130 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -1,18 +1,19 @@ -{ lib -, SDL2 -, cmake -, extra-cmake-modules -, fetchFromGitHub -, libGL -, libarchive -, libpcap -, qt6 -, libslirp -, pkg-config -, stdenv -, unstableGitUpdater -, wayland -, zstd +{ + lib, + SDL2, + cmake, + extra-cmake-modules, + fetchFromGitHub, + libGL, + libarchive, + libpcap, + libslirp, + pkg-config, + qt6, + stdenv, + unstableGitUpdater, + wayland, + zstd, }: let