From 16c3d4289e3b50abf9d1803c81e4778ac68c2c40 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 12 Jun 2023 23:29:16 +0000 Subject: [PATCH] cross: jellyfin-media-player-qt6: fix wrapQtAppsHook --- overlays/cross.nix | 10 +++++++--- pkgs/additional/jellyfin-media-player-qt6/default.nix | 1 - 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/overlays/cross.nix b/overlays/cross.nix index 18fd40bc..949ef262 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -656,9 +656,13 @@ in { ]; }; })); - jellyfin-media-player-qt6 = mvToBuildInputs - [ final.qt6.wrapQtAppsHook ] # otherwise the result targets x86. TODO: fix the hook in qt6 itself? - prev.jellyfin-media-player-qt6; + jellyfin-media-player-qt6 = prev.jellyfin-media-player-qt6.overrideAttrs (upstream: { + # nativeBuildInputs => result targets x86. + # buildInputs => result targets correct platform, but doesn't wrap the runtime deps + # TODO: fix the hook in qt6 itself? + depsHostHost = upstream.depsHostHost or [] ++ [ final.qt6.wrapQtAppsHook ]; + nativeBuildInputs = lib.remove [ final.qt6.wrapQtAppsHook ] upstream.nativeBuildInputs; + }); # jellyfin-web = prev.jellyfin-web.override { # # in node-dependencies-jellyfin-web: "node: command not found" # inherit (emulated) stdenv; diff --git a/pkgs/additional/jellyfin-media-player-qt6/default.nix b/pkgs/additional/jellyfin-media-player-qt6/default.nix index 8e9eafcc..9903f450 100644 --- a/pkgs/additional/jellyfin-media-player-qt6/default.nix +++ b/pkgs/additional/jellyfin-media-player-qt6/default.nix @@ -51,7 +51,6 @@ ninja pkg-config python3 - qt6.wrapQtAppsHook #< new: libsForQt5.callPackage implicitly adds the qt5 wrapQtAppsHook ];