BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #168551 from infinisil/syncplay-no-gui

Browse source 
syncplay: Allow disabling GUI
This commit is contained in:
Silvan Mosberger 2022-04-17 19:05:29 +02:00 committed by GitHub
commit 4de6cbc904
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/networking/syncplay.nix
View file

@ -89,7 +89,7 @@ in
${lib.optionalString (cfg.passwordFile != null) '' ${lib.optionalString (cfg.passwordFile != null) ''
export SYNCPLAY_PASSWORD=$(cat "''${CREDENTIALS_DIRECTORY}/password") export SYNCPLAY_PASSWORD=$(cat "''${CREDENTIALS_DIRECTORY}/password")
''} ''}
exec ${pkgs.syncplay}/bin/syncplay-server ${escapeShellArgs cmdArgs} exec ${pkgs.syncplay-nogui}/bin/syncplay-server ${escapeShellArgs cmdArgs}
''; '';
}; };
}; };

10
pkgs/applications/networking/syncplay/default.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildPythonApplication, pyside2, shiboken2, twisted, certifi, qt5 }: { lib, fetchFromGitHub, buildPythonApplication, pyside2, twisted, certifi, qt5, enableGUI ? true }:
buildPythonApplication rec { buildPythonApplication rec {
pname = "syncplay"; pname = "syncplay";
@ -13,12 +13,14 @@ buildPythonApplication rec {
sha256 = "0qm3qn4a1nahhs7q81liz514n9blsi107g9s9xfw2i8pzi7v9v0v"; sha256 = "0qm3qn4a1nahhs7q81liz514n9blsi107g9s9xfw2i8pzi7v9v0v";
}; };
propagatedBuildInputs = [ pyside2 shiboken2 twisted certifi ] ++ twisted.extras.tls; propagatedBuildInputs = [ twisted certifi ]
nativeBuildInputs = [ qt5.wrapQtAppsHook ]; ++ twisted.extras.tls
++ lib.optional enableGUI pyside2;
nativeBuildInputs = lib.optionals enableGUI [ qt5.wrapQtAppsHook ];
makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ];
postFixup = '' postFixup = lib.optionalString enableGUI ''
wrapQtApp $out/bin/syncplay wrapQtApp $out/bin/syncplay
''; '';

2
pkgs/top-level/all-packages.nix
View file

@ -29347,6 +29347,8 @@ with pkgs;
syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { }; syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { };
syncplay-nogui = syncplay.override { enableGUI = false; };
syncterm = callPackage ../applications/terminal-emulators/syncterm { }; syncterm = callPackage ../applications/terminal-emulators/syncterm { };
inherit (callPackages ../applications/networking/syncthing { }) inherit (callPackages ../applications/networking/syncthing { })