From bf82581fda887d54447a4456f1d6915ab7602b14 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Thu, 17 Oct 2024 20:11:50 +0800 Subject: [PATCH] moonlight-qt: 6.0.1 -> 6.1.0 - Bump apple sdk to 12.3 to fix build error `error: expected ';' after top level declarator` - Use finalAttrs pattern - Add meta.changelog - Remove `with lib` usage Changelog: https://github.com/moonlight-stream/moonlight-qt/releases/tag/v6.1.0 --- pkgs/by-name/mo/moonlight-qt/package.nix | 38 ++++++++++++++---------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/mo/moonlight-qt/package.nix b/pkgs/by-name/mo/moonlight-qt/package.nix index 62a3b556a3a3..ed73a1279a46 100644 --- a/pkgs/by-name/mo/moonlight-qt/package.nix +++ b/pkgs/by-name/mo/moonlight-qt/package.nix @@ -25,33 +25,40 @@ }: let - inherit (darwin.apple_sdk_11_0.frameworks) + inherit (darwin.apple_sdk_12_3.frameworks) AVFoundation AppKit AudioUnit Cocoa VideoToolbox ; - stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; + stdenv' = + if stdenv.hostPlatform.isDarwin then + overrideSDK stdenv { + darwinMinVersion = "11.0"; + darwinSdkVersion = "12.3"; + } + else + stdenv; in -stdenv'.mkDerivation rec { +stdenv'.mkDerivation (finalAttrs: { pname = "moonlight-qt"; - version = "6.0.1"; + version = "6.1.0"; src = fetchFromGitHub { owner = "moonlight-stream"; - repo = pname; - rev = "v${version}"; - hash = "sha256-zrl8WPXvQ/7FTqFnpwoXEJ85prtgJWoWNsdckw5+JHI="; + repo = "moonlight-qt"; + rev = "v${finalAttrs.version}"; + hash = "sha256-rWVNpfRDLrWsqELPFquA6rW6/AfWV+6DNLUCPqIhle0="; fetchSubmodules = true; }; patches = [ - # Don't precompile QML files with disable-prebuilts, fix build on darwin + # Fix build for Xcode < 14 (fetchpatch { - url = "https://github.com/moonlight-stream/moonlight-qt/commit/d73df12367749425b86b72c250bb0fba13ddfd29.patch"; - hash = "sha256-RIrQpZWbwUHs1Iwz/pXfXgshJeHYrzGxuaR5mRG85QY="; + url = "https://github.com/moonlight-stream/moonlight-qt/commit/76deafbd7bf868562d69061e7d6abf2612a2c7ad.patch"; + hash = "sha256-+rXdexZQpOP6yS+oTmvYVxasWxOX16uU1udN75zNX3w="; }) ]; @@ -101,16 +108,17 @@ stdenv'.mkDerivation rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { + changelog = "https://github.com/moonlight-stream/moonlight-qt/releases/tag/v${finalAttrs.version}"; description = "Play your PC games on almost any device"; homepage = "https://moonlight-stream.org"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ azuwis luc65r zmitchell ]; - platforms = platforms.all; + platforms = lib.platforms.all; mainProgram = "moonlight"; }; -} +})