dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

moonlight-qt: upgrade to qt6

Browse Source
This commit is contained in:
Zhong Jianxin 2024-07-05 09:03:23 +08:00
parent c99ceeab58
commit 52aa4beb18
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/by-name/mo/moonlight-qt/package.nix
View File

@ -2,9 +2,10 @@
stdenv, stdenv,
lib, lib,
fetchFromGitHub, fetchFromGitHub,
fetchpatch,
darwin, darwin,
overrideSDK, overrideSDK,
libsForQt5, qt6,
pkg-config, pkg-config,
vulkan-headers, vulkan-headers,
SDL2, SDL2,
@ -27,6 +28,7 @@ let
AVFoundation AVFoundation
AppKit AppKit
AudioUnit AudioUnit
Cocoa
VideoToolbox VideoToolbox
; ;
stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
@ -44,9 +46,17 @@ stdenv'.mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [
# Don't precompile QML files with disable-prebuilts, fix build on darwin
(fetchpatch {
url = "https://github.com/moonlight-stream/moonlight-qt/commit/d73df12367749425b86b72c250bb0fba13ddfd29.patch";
hash = "sha256-RIrQpZWbwUHs1Iwz/pXfXgshJeHYrzGxuaR5mRG85QY=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
libsForQt5.qmake qt6.qmake
libsForQt5.wrapQtAppsHook qt6.wrapQtAppsHook
pkg-config pkg-config
vulkan-headers vulkan-headers
]; ];
@ -58,7 +68,8 @@ stdenv'.mkDerivation rec {
ffmpeg ffmpeg
libopus libopus
libplacebo libplacebo
libsForQt5.qtquickcontrols2 qt6.qtdeclarative
qt6.qtsvg
openssl openssl
] ]
++ lib.optionals stdenv.isLinux [ ++ lib.optionals stdenv.isLinux [
@ -67,12 +78,14 @@ stdenv'.mkDerivation rec {
libva libva
libvdpau libvdpau
libxkbcommon libxkbcommon
qt6.qtwayland
wayland wayland
] ]
++ lib.optionals stdenv.isDarwin [ ++ lib.optionals stdenv.isDarwin [
AVFoundation AVFoundation
AppKit AppKit
AudioUnit AudioUnit
Cocoa
VideoToolbox VideoToolbox
]; ];