diff --git a/pkgs/applications/video/jellyfin-desktop/non-fatal-unique-app.patch b/pkgs/by-name/je/jellyfin-desktop/non-fatal-unique-app.patch similarity index 100% rename from pkgs/applications/video/jellyfin-desktop/non-fatal-unique-app.patch rename to pkgs/by-name/je/jellyfin-desktop/non-fatal-unique-app.patch diff --git a/pkgs/applications/video/jellyfin-desktop/default.nix b/pkgs/by-name/je/jellyfin-desktop/package.nix similarity index 86% rename from pkgs/applications/video/jellyfin-desktop/default.nix rename to pkgs/by-name/je/jellyfin-desktop/package.nix index 12ac1682972f..0c62dc24ed2d 100644 --- a/pkgs/applications/video/jellyfin-desktop/default.nix +++ b/pkgs/by-name/je/jellyfin-desktop/package.nix @@ -5,27 +5,22 @@ cmake, ninja, python3, - wrapQtAppsHook, - qtbase, - qtdeclarative, - qtwebchannel, - qtwebengine, + kdePackages, mpv-unwrapped, - mpvqt, libcec, SDL2, libxrandr, cacert, nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jellyfin-desktop"; version = "2.0.0"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-desktop"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ITlYOrMS6COx9kDRSBi4wM6mzL/Q2G5X9GbABwDIOe4="; fetchSubmodules = true; }; @@ -36,15 +31,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja - wrapQtAppsHook + kdePackages.wrapQtAppsHook ] ++ lib.optional stdenv.hostPlatform.isDarwin python3; buildInputs = [ - qtbase - qtdeclarative - qtwebchannel - qtwebengine + kdePackages.qtbase + kdePackages.qtdeclarative + kdePackages.qtwebchannel + kdePackages.qtwebengine mpv-unwrapped # input sources @@ -55,7 +50,7 @@ stdenv.mkDerivation rec { libxrandr cacert ] - ++ lib.optional (!stdenv.hostPlatform.isDarwin) mpvqt; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) kdePackages.mpvqt; cmakeFlags = [ "-DCHECK_FOR_UPDATES=OFF" @@ -97,4 +92,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "jellyfin-desktop"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca889888c1c5..c425e76621f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1791,8 +1791,6 @@ with pkgs; intensity-normalization = with python3Packages; toPythonApplication intensity-normalization; - jellyfin-desktop = kdePackages.callPackage ../applications/video/jellyfin-desktop { }; - jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; klaus = with python3Packages; toPythonApplication klaus;