From e5514c8d6e8bec069f4974201007198dd7b268e2 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Fri, 12 May 2023 10:17:58 +1000 Subject: [PATCH 1/2] syncplay: 1.6.9 -> 1.7.0 --- pkgs/applications/networking/syncplay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 5fe82ed28a02..4975b477a59c 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "syncplay"; - version = "1.6.9"; + version = "1.7.0"; format = "other"; @@ -10,7 +10,7 @@ buildPythonApplication rec { owner = "Syncplay"; repo = "syncplay"; rev = "v${version}"; - sha256 = "0qm3qn4a1nahhs7q81liz514n9blsi107g9s9xfw2i8pzi7v9v0v"; + sha256 = "sha256-Te81yOv3D6M6aMfC5XrM6/I6BlMdlY1yRk1RRJa9Mxg="; }; buildInputs = lib.optionals enableGUI [ qt5.qtwayland ]; From 5b636863464dd5d16c7b0d31fb1cd23cac95af5b Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Fri, 12 May 2023 10:18:32 +1000 Subject: [PATCH 2/2] syncplay: Switch to PySide6 and Qt6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Syncplay now works on macOS 🎉 --- .../networking/syncplay/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 4975b477a59c..367e9bb7089a 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -1,4 +1,14 @@ -{ lib, fetchFromGitHub, buildPythonApplication, pyside2, twisted, certifi, qt5, enableGUI ? true }: +{ lib +, stdenv +, fetchFromGitHub +, buildPythonApplication +, pyside6 +, twisted +, certifi +, qt6 +, appnope +, enableGUI ? true +}: buildPythonApplication rec { pname = "syncplay"; @@ -13,11 +23,12 @@ buildPythonApplication rec { sha256 = "sha256-Te81yOv3D6M6aMfC5XrM6/I6BlMdlY1yRk1RRJa9Mxg="; }; - buildInputs = lib.optionals enableGUI [ qt5.qtwayland ]; + buildInputs = lib.optionals enableGUI [ (if stdenv.isLinux then qt6.qtwayland else qt6.qtbase) ]; propagatedBuildInputs = [ twisted certifi ] ++ twisted.optional-dependencies.tls - ++ lib.optional enableGUI pyside2; - nativeBuildInputs = lib.optionals enableGUI [ qt5.wrapQtAppsHook ]; + ++ lib.optional enableGUI pyside6 + ++ lib.optional (stdenv.isDarwin && enableGUI) appnope; + nativeBuildInputs = lib.optionals enableGUI [ qt6.wrapQtAppsHook ]; makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; @@ -29,7 +40,7 @@ buildPythonApplication rec { homepage = "https://syncplay.pl/"; description = "Free software that synchronises media players"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ Enzime ]; }; }