From b6efb248503cc6eb7fb9cebcbc2e55a94712b9b1 Mon Sep 17 00:00:00 2001 From: Scott Olson Date: Fri, 28 Jun 2019 00:23:31 -0600 Subject: [PATCH 1/3] syncplay: upgrade from Qt4 to Qt5 dependency Syncplay automatically detects whether it has access to PySide, which binds Qt4, or PySide2, which binds Qt5. By simply updating the dependencies, we can upgrade Syncplay to Qt5. --- 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 3e5d3187e9b..0e31893e9a4 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonApplication, pyside, twisted, certifi }: +{ lib, fetchFromGitHub, buildPythonApplication, pyside2, shiboken2, twisted, certifi }: buildPythonApplication rec { pname = "syncplay"; @@ -13,7 +13,7 @@ buildPythonApplication rec { sha256 = "0afh2a0l1c3hwgj5q6wy0v5iimg8qcjam3pw7b8mf63lasx6iqk4"; }; - propagatedBuildInputs = [ pyside twisted certifi ] ++ twisted.extras.tls; + propagatedBuildInputs = [ pyside2 shiboken2 twisted certifi ] ++ twisted.extras.tls; makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; From 2e677bde28feb81255c4c953d2fb0c2ae51a45e5 Mon Sep 17 00:00:00 2001 From: Scott Olson Date: Fri, 28 Jun 2019 00:24:16 -0600 Subject: [PATCH 2/3] syncplay: 1.6.4 -> 1.6.4a --- 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 0e31893e9a4..ce17db93370 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.4"; + version = "1.6.4a"; format = "other"; @@ -10,7 +10,7 @@ buildPythonApplication rec { owner = "Syncplay"; repo = "syncplay"; rev = "v${version}"; - sha256 = "0afh2a0l1c3hwgj5q6wy0v5iimg8qcjam3pw7b8mf63lasx6iqk4"; + sha256 = "0zz4a3vzfg808z1qkqz31z4818wzpfa2lika7wl0jgpmw4zi85ix"; }; propagatedBuildInputs = [ pyside2 shiboken2 twisted certifi ] ++ twisted.extras.tls; From 487759d1b001a0cd68e2e98c8c2ae89883f1dcf7 Mon Sep 17 00:00:00 2001 From: Scott Olson Date: Thu, 19 Dec 2019 14:52:32 -0600 Subject: [PATCH 3/3] syncplay: apply wrapQtAppsHook fix --- pkgs/applications/networking/syncplay/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index ce17db93370..920a1c97539 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonApplication, pyside2, shiboken2, twisted, certifi }: +{ lib, fetchFromGitHub, buildPythonApplication, pyside2, shiboken2, twisted, certifi, qt5 }: buildPythonApplication rec { pname = "syncplay"; @@ -14,9 +14,14 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ pyside2 shiboken2 twisted certifi ] ++ twisted.extras.tls; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; + postFixup = '' + wrapQtApp $out/bin/syncplay + ''; + meta = with lib; { homepage = https://syncplay.pl/; description = "Free software that synchronises media players";