From 4cf4c38da33634f67a9fca2d29d5b0980f773664 Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 1 Jun 2023 21:11:18 +0000 Subject: [PATCH] WIP: jellyfin-media-player: support qt6 the hope is that achieving this would allo much faster mobile deployments as qt6 can generally compile w/o emulation --- .../jellyfin-media-player-qt6/default.nix | 42 +++++++++++++++++++ pkgs/default.nix | 1 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/additional/jellyfin-media-player-qt6/default.nix diff --git a/pkgs/additional/jellyfin-media-player-qt6/default.nix b/pkgs/additional/jellyfin-media-player-qt6/default.nix new file mode 100644 index 00000000..71b3e2c5 --- /dev/null +++ b/pkgs/additional/jellyfin-media-player-qt6/default.nix @@ -0,0 +1,42 @@ +{ lib +, fetchFromGitHub +, jellyfin-media-player +, libGL +, libX11 +, libXrandr +, libvdpau +, mpv +, qt6 +, SDL2 +, stdenv +}: +jellyfin-media-player.overrideAttrs (upstream: { + src = fetchFromGitHub { + owner = "jellyfin"; + repo = "jellyfin-media-player"; + rev = "qt6"; + hash = "sha256-saR/P2daqjF0G8N7BX6Rtsb1dWGjdf5MPDx1lhoioEw="; + }; + # nixos ships two patches: + # - the first fixes "web paths" and has *mostly* been upstreamed (so skip) + # - the second disables auto-update notifications (keep) + patches = builtins.tail upstream.patches; + buildInputs = [ + SDL2 + libGL + libX11 + libXrandr + libvdpau + mpv + qt6.qtbase + qt6.qtwebchannel + qt6.qtwebengine + # qtx11extras + ] ++ lib.optionals stdenv.isLinux [ + qt6.qtwayland + ]; + + meta = upstream.meta // { + platforms = upstream.meta.platforms ++ [ "aarch64-linux" ]; + }; +}) diff --git a/pkgs/default.nix b/pkgs/default.nix index 7fb3baab..164b027b 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -25,6 +25,7 @@ let browserpass-extension = callPackage ./additional/browserpass-extension { }; cargoDocsetHook = callPackage ./additional/cargo-docset/hook.nix { }; feeds = lib.recurseIntoAttrs (callPackage ./additional/feeds { }); + jellyfin-media-player-qt6 = callPackage ./additional/jellyfin-media-player-qt6 { }; gopass-native-messaging-host = callPackage ./additional/gopass-native-messaging-host { }; gpodder-configured = callPackage ./additional/gpodder-configured { }; hare-ev = unpatched.hare-ev or (callPackage ./additional/hare-ev { });