From 40c9517dc6574d9c65b9293740d9f7eb19d07752 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Fri, 7 Apr 2023 22:55:02 +0000
Subject: [PATCH] moby: ship jellyfin (and it runs!)

---
 hosts/common/cross/default.nix    | 16 +++++++++++++++-
 hosts/common/programs.nix         |  2 +-
 overlays/disable-flakey-tests.nix | 14 ++++++++------
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/hosts/common/cross/default.nix b/hosts/common/cross/default.nix
index 6ff11c0a..a5f9452e 100644
--- a/hosts/common/cross/default.nix
+++ b/hosts/common/cross/default.nix
@@ -412,6 +412,7 @@ in
             # nixpkgs hdf5 is at commit 3e847e003632bdd5fdc189ccbffe25ad2661e16f
             # hdf5  # configure: error: cannot run test program while cross compiling
             # 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!)
             # libsForQt5  # qtbase  # make: g++: No such file or directory
             # 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: {
             # 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";
@@ -1051,7 +1064,7 @@ in
           libHX = mvToNativeInputs [ next.libtool ] prev.libHX;
           # 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);
-          #   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
           libjcat = addNativeInputs [ next.gnutls ] prev.libjcat;
           libqmi = prev.libqmi.overrideAttrs (upstream: {
@@ -1267,6 +1280,7 @@ in
             ];
           } prev.phosh-mobile-settings;
           # 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;
           # psqlodbc = prev.psqlodbc.override {
           #   # fixes "configure: error: odbc_config not found (required for unixODBC build)"
diff --git a/hosts/common/programs.nix b/hosts/common/programs.nix
index 9ac99841..42cc832b 100644
--- a/hosts/common/programs.nix
+++ b/hosts/common/programs.nix
@@ -167,6 +167,7 @@ let
       "gnome.gnome-weather"
       gpodder-configured
       gthumb
+      jellyfin-media-player
       # lollypop
       mpv
       networkmanagerapplet
@@ -207,7 +208,6 @@ let
       handbrake
       hase
       inkscape
-      jellyfin-media-player  # TODO: try on moby!
       kdenlive
       kid3  # audio tagging
       krita
diff --git a/overlays/disable-flakey-tests.nix b/overlays/disable-flakey-tests.nix
index 214067d6..9373ba6c 100644
--- a/overlays/disable-flakey-tests.nix
+++ b/overlays/disable-flakey-tests.nix
@@ -5,12 +5,14 @@
 # - they assume too much about their environment and fail under qemu.
 #
 (next: prev: {
-  # ell = prev.ell.overrideAttrs (_upstream: {
-  #   # 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))"
-  #   # unclear *why* this test fails.
-  #   doCheck = false;
-  # });
+  ell = prev.ell.overrideAttrs (_upstream: {
+    # 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))"
+    # 2023/04/06
+    # 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: {
   #   # 2023/02/28
   #   # The following tests FAILED: