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

moby: ship jellyfin (and it runs!)

Browse Source
This commit is contained in:
Colin 2023-04-07 22:55:02 +00:00
parent c2915e29d4
commit 40c9517dc6
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hosts/common/cross/default.nix
View File

@ -412,6 +412,7 @@ in
# nixpkgs hdf5 is at commit 3e847e003632bdd5fdc189ccbffe25ad2661e16f # nixpkgs hdf5 is at commit 3e847e003632bdd5fdc189ccbffe25ad2661e16f
# hdf5 # configure: error: cannot run test program while cross compiling # hdf5 # configure: error: cannot run test program while cross compiling
# http2 # http2
jellyfin-web # in node-dependencies-jellyfin-web: "node: command not found" (nodePackages don't cross compile)
# libgccjit # "../../gcc-9.5.0/gcc/jit/jit-result.c:52:3: error: 'dlclose' was not declared in this scope" (needed by emacs!) # libgccjit # "../../gcc-9.5.0/gcc/jit/jit-result.c:52:3: error: 'dlclose' was not declared in this scope" (needed by emacs!)
# libsForQt5 # qtbase # make: g++: No such file or directory # libsForQt5 # qtbase # make: g++: No such file or directory
# perlInterpreters # perl5.36.0-Module-Build perl5.36.0-Test-utf8 (see tracking issues ^) # perlInterpreters # perl5.36.0-Module-Build perl5.36.0-Test-utf8 (see tracking issues ^)
@ -1013,6 +1014,18 @@ in
}; };
}; };
jellyfin-media-player = prev.jellyfin-media-player.overrideAttrs (upstream: {
meta = upstream.meta // {
platforms = upstream.meta.platforms ++ [
"aarch64-linux"
];
};
});
# jellyfin-web = prev.jellyfin-web.override {
# # in node-dependencies-jellyfin-web: "node: command not found"
# inherit (emulated) stdenv;
# };
kitty = prev.kitty.overrideAttrs (upstream: { kitty = prev.kitty.overrideAttrs (upstream: {
# fixes: "FileNotFoundError: [Errno 2] No such file or directory: 'pkg-config'" # fixes: "FileNotFoundError: [Errno 2] No such file or directory: 'pkg-config'"
PKGCONFIG_EXE = "${next.buildPackages.pkg-config}/bin/${next.buildPackages.pkg-config.targetPrefix}pkg-config"; PKGCONFIG_EXE = "${next.buildPackages.pkg-config}/bin/${next.buildPackages.pkg-config.targetPrefix}pkg-config";
@ -1051,7 +1064,7 @@ in
libHX = mvToNativeInputs [ next.libtool ] prev.libHX; libHX = mvToNativeInputs [ next.libtool ] prev.libHX;
# fixes: "ERROR: Program 'gnutls-certtool certtool' not found or not executable" # fixes: "ERROR: Program 'gnutls-certtool certtool' not found or not executable"
# N.B.: gnutls library is used by the compiled program (i.e. the host); # N.B.: gnutls library is used by the compiled program (i.e. the host);
# gnutls binaries are used by the build machine. # gnutls binaries are used by the build machine (for tests).
# therefore gnutls can be specified in both buildInputs and nativeBuildInputs # therefore gnutls can be specified in both buildInputs and nativeBuildInputs
libjcat = addNativeInputs [ next.gnutls ] prev.libjcat; libjcat = addNativeInputs [ next.gnutls ] prev.libjcat;
libqmi = prev.libqmi.overrideAttrs (upstream: { libqmi = prev.libqmi.overrideAttrs (upstream: {
@ -1267,6 +1280,7 @@ in
]; ];
} prev.phosh-mobile-settings; } prev.phosh-mobile-settings;
# fixes `spa/plugins/bluez5/meson.build:41:0: ERROR: Program 'gdbus-codegen' not found or not executable` # fixes `spa/plugins/bluez5/meson.build:41:0: ERROR: Program 'gdbus-codegen' not found or not executable`
# TODO (2023/04/07): remove pipewire override. it builds on staging
pipewire = mvToNativeInputs [ next.glib ] prev.pipewire; pipewire = mvToNativeInputs [ next.glib ] prev.pipewire;
# psqlodbc = prev.psqlodbc.override { # psqlodbc = prev.psqlodbc.override {
# # fixes "configure: error: odbc_config not found (required for unixODBC build)" # # fixes "configure: error: odbc_config not found (required for unixODBC build)"

2
hosts/common/programs.nix
View File

@ -167,6 +167,7 @@ let
"gnome.gnome-weather" "gnome.gnome-weather"
gpodder-configured gpodder-configured
gthumb gthumb
jellyfin-media-player
# lollypop # lollypop
mpv mpv
networkmanagerapplet networkmanagerapplet
@ -207,7 +208,6 @@ let
handbrake handbrake
hase hase
inkscape inkscape
jellyfin-media-player # TODO: try on moby!
kdenlive kdenlive
kid3 # audio tagging kid3 # audio tagging
krita krita

14
overlays/disable-flakey-tests.nix
View File

@ -5,12 +5,14 @@
# - they assume too much about their environment and fail under qemu. # - they assume too much about their environment and fail under qemu.
# #
(next: prev: { (next: prev: {
# ell = prev.ell.overrideAttrs (_upstream: { ell = prev.ell.overrideAttrs (_upstream: {
# # 2023/02/11 # 2023/02/11
# # fixes "TEST FAILED in get_random_return_callback at unit/test-dbus-message-fds.c:278: !l_dbus_message_get_error(message, ((void *)0), ((void *)0))" # fixes "TEST FAILED in get_random_return_callback at unit/test-dbus-message-fds.c:278: !l_dbus_message_get_error(message, ((void *)0), ((void *)0))"
# # unclear *why* this test fails. # 2023/04/06
# doCheck = false; # fixes "test-cipher: unit/test-cipher.c:102: test_aes_ctr: Assertion `!r' failed."
# }); # unclear *why* this test fails.
doCheck = false;
});
# fish = prev.fish.overrideAttrs (_upstream: { # fish = prev.fish.overrideAttrs (_upstream: {
# # 2023/02/28 # # 2023/02/28
# # The following tests FAILED: # # The following tests FAILED: