From f7ad9a49d3d681ac75d37c8b0265e5b4d34e0589 Mon Sep 17 00:00:00 2001 From: Mistyttm Date: Thu, 2 Apr 2026 12:37:48 +1000 Subject: [PATCH] tdarr: add missing packages to build and path --- pkgs/tools/misc/tdarr/common.nix | 8 ++++++++ pkgs/tools/misc/tdarr/node.nix | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/tdarr/common.nix b/pkgs/tools/misc/tdarr/common.nix index 6ef7469c2308..499e642b4c95 100644 --- a/pkgs/tools/misc/tdarr/common.nix +++ b/pkgs/tools/misc/tdarr/common.nix @@ -24,6 +24,7 @@ libxfixes, tesseract4, perl, + apprise, }: { pname, @@ -129,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: { libx11 libxcursor libxfixes + apprise ]; postPatch = '' @@ -159,6 +161,12 @@ stdenv.mkDerivation (finalAttrs: { ''; postInstall = '' + # Remove musl-only prebuilt Node addons on glibc systems. + # autoPatchelf scans all ELF files in $out and fails if musl libc is missing. + ${lib.optionalString (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl) '' + find $out/share/${pname} -type f -name '*.musl.node' -delete + ''} + makeWrapper $out/share/${pname}/${componentName} $out/bin/${pname} ${commonWrapperArgs} makeWrapper $out/share/${pname}/${componentTrayName} $out/bin/${pname}-tray ${commonWrapperArgs} '' diff --git a/pkgs/tools/misc/tdarr/node.nix b/pkgs/tools/misc/tdarr/node.nix index 869ac289ce23..980cc208b0bb 100644 --- a/pkgs/tools/misc/tdarr/node.nix +++ b/pkgs/tools/misc/tdarr/node.nix @@ -1,4 +1,4 @@ -{ callPackage }: +{ callPackage, ccextractor }: callPackage ./common.nix { } { pname = "tdarr-node"; @@ -10,4 +10,6 @@ callPackage ./common.nix { } { darwin_x64 = "sha256-icgzoHqZ+P6gXJ8jQTau3O2D6uRvET4MtNoWJI/JnvM="; darwin_arm64 = "sha256-Rw478IpDLLe+Ek3Jt5Duaq1sHL1D3pE0HkVqk+v1ECE="; }; + + includeInPath = [ ccextractor ]; }