colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

cross: jellyfin-media-player-qt6: fix wrapQtAppsHook

Browse Source
This commit is contained in:
Colin 2023-06-12 23:29:16 +00:00
parent 21e0c0d00f
commit 16c3d4289e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
overlays/cross.nix
View File

@ -656,9 +656,13 @@ in {
]; ];
}; };
})); }));
jellyfin-media-player-qt6 = mvToBuildInputs jellyfin-media-player-qt6 = prev.jellyfin-media-player-qt6.overrideAttrs (upstream: {
[ final.qt6.wrapQtAppsHook ] # otherwise the result targets x86. TODO: fix the hook in qt6 itself? # nativeBuildInputs => result targets x86.
prev.jellyfin-media-player-qt6; # 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 { # jellyfin-web = prev.jellyfin-web.override {
# # in node-dependencies-jellyfin-web: "node: command not found" # # in node-dependencies-jellyfin-web: "node: command not found"
# inherit (emulated) stdenv; # inherit (emulated) stdenv;

1
pkgs/additional/jellyfin-media-player-qt6/default.nix
View File

@ -51,7 +51,6 @@
ninja ninja
pkg-config pkg-config
python3 python3
qt6.wrapQtAppsHook #< new: libsForQt5.callPackage implicitly adds the qt5 wrapQtAppsHook qt6.wrapQtAppsHook #< new: libsForQt5.callPackage implicitly adds the qt5 wrapQtAppsHook
]; ];