diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-07-17 00:02:14 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-17 00:02:14 +0000 |
commit | 8df1eb061afb6575e7c618b1ea15b4d52ef0494b (patch) | |
tree | b0d2f614e7619a5cf06307fbe66177f94073b923 /pkgs/applications/video | |
parent | 0879ac5da62202ca0eb342ddca4fcefe46f2d84f (diff) | |
parent | 2815ff97dd5384da30a928addf8ca6563e33b034 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/jellyfin-media-player/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index 0afd173debdb5..4f2b4ef440f76 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -23,6 +23,7 @@ , qtwebengine , qtx11extras , jellyfin-web +, withDbus ? stdenv.isLinux, dbus }: mkDerivation rec { @@ -74,6 +75,8 @@ mkDerivation rec { "-DCMAKE_BUILD_TYPE=Release" "-DQTROOT=${qtbase}" "-GNinja" + ] ++ lib.optionals (!withDbus) [ + "-DLINUX_X11POWER=ON" ]; preBuild = '' |