From 8529057cc6100cd60bf3fcd73cfccaf13265a3b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Sun, 23 Jan 2022 23:10:26 +0100 Subject: [PATCH 1/4] plex-media-player: add myself as maintainer --- pkgs/applications/video/plex-media-player/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index 81b354fe1fff..c31f874ef87e 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -41,7 +41,7 @@ in mkDerivation rec { meta = with lib; { description = "Streaming media player for Plex"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ b4dm4n ]; homepage = "https://plex.tv"; }; } From 0bf621e1345b0a5878d1f989392a22f3086f678f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Sun, 23 Jan 2022 23:12:39 +0100 Subject: [PATCH 2/4] plex-media-player: use libsForQt5 --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3c1cc49c8c8..d354ba736f6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28073,8 +28073,7 @@ with pkgs; plexamp = callPackage ../applications/audio/plexamp { }; - # Upstream says it supports only qt5.9 which is not packaged, and building with qt newer than 5.12 fails - plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { }; + plex-media-player = libsForQt5.callPackage ../applications/video/plex-media-player { }; plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; From d0fe0e93cca467fc077cc97d82ef8861e2c2ab69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Sun, 23 Jan 2022 23:14:06 +0100 Subject: [PATCH 3/4] plex-media-player: fix crash under wayland --- pkgs/applications/video/plex-media-player/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index c31f874ef87e..576762ad9e09 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -36,6 +36,9 @@ in mkDerivation rec { cmakeFlags = [ "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DQTROOT=${qtbase}" ]; + # plexmediaplayer currently segfaults under wayland + qtWrapperArgs = [ "--set" "QT_QPA_PLATFORM" "xcb" ]; + passthru.updateScript = ./update.sh; meta = with lib; { From d771cfe971d95ec0c4221d8ea14abafa0c351bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Sun, 23 Jan 2022 23:15:25 +0100 Subject: [PATCH 4/4] plex-media-player: add meta.mainProgram --- pkgs/applications/video/plex-media-player/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index 576762ad9e09..34b6eb9c2862 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -46,5 +46,6 @@ in mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ b4dm4n ]; homepage = "https://plex.tv"; + mainProgram = "plexmediaplayer"; }; }