mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-06 04:27:27 +03:00
Merge pull request #324709 from atorres1985-contrib/melonds
melonDS: use qt6 libraries
This commit is contained in:
commit
a24268ed1b
@ -1,24 +1,23 @@
|
||||
{ lib
|
||||
, SDL2
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, fetchFromGitHub
|
||||
, libGL
|
||||
, libarchive
|
||||
, libpcap
|
||||
, libsForQt5
|
||||
, 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
|
||||
qt = if stdenv.isLinux then libsForQt5 else qt6;
|
||||
inherit (qt)
|
||||
inherit (qt6)
|
||||
qtbase
|
||||
qtmultimedia
|
||||
wrapQtAppsHook;
|
||||
@ -53,6 +52,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wayland
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "USE_QT6" true)
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
qtWrapperArgs = lib.optionals stdenv.isLinux [
|
||||
|
Loading…
Reference in New Issue
Block a user