Fix jupiter bugs

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
2025-07-20 20:21:06 +01:00
parent 1587967488
commit 4a2d99957b
4 changed files with 18 additions and 2 deletions

View File

@@ -115,5 +115,10 @@ pkgs.dockerTools.buildImage {
"/var/log/jellyfin" = { }; "/var/log/jellyfin" = { };
"/tmp/jellyfin" = { }; "/tmp/jellyfin" = { };
}; };
Env = [
# FIXME: https://github.com/NixOS/nixpkgs/issues/176081
"FONTCONFIG_FILE=${pkgs.fontconfig.out}/etc/fonts/fonts.conf"
"FONTCONFIG_PATH=${pkgs.fontconfig.out}/etc/fonts/"
];
}; };
} }

View File

@@ -23,7 +23,8 @@ let
pnpmDeps = (pkgs.pnpm_9.override { nodejs = pkgs.nodejs_22; }).fetchDeps { pnpmDeps = (pkgs.pnpm_9.override { nodejs = pkgs.nodejs_22; }).fetchDeps {
inherit src; inherit src;
inherit (oldAttrs) pname version; inherit (oldAttrs) pname version;
hash = "sha256-lq/b2PqQHsZmnw91Ad4h1uxZXsPATSLqIdb/t2EsmMI="; fetcherVersion = 2;
hash = "sha256-Ek2z1KIel3egwZ9dGU7rJQEyhukmXw5chsfvI2w8v28=";
}; };
} }
); );

View File

@@ -161,7 +161,8 @@ pkgs.dockerTools.buildImage {
config = { config = {
Entrypoint = [ "entrypoint" ]; Entrypoint = [ "entrypoint" ];
Cmd = [ Cmd = [
"-DFOREGROUND" "-D"
"FOREGROUND"
"-f" "-f"
"/etc/httpd/httpd.conf" "/etc/httpd/httpd.conf"
]; ];

View File

@@ -33,6 +33,15 @@ let
shlink = pkgs.runCommandLocal "shlink" { } '' shlink = pkgs.runCommandLocal "shlink" { } ''
mkdir -p $out/var/www mkdir -p $out/var/www
cp -r ${selfPkgs.shlink} $out/var/www/shlink cp -r ${selfPkgs.shlink} $out/var/www/shlink
rr_config_path="$out/var/www/shlink/config/roadrunner/.rr.yml"
original_mode="$(stat -c "%a" "$rr_config_path")"
chmod u+w "$rr_config_path"
${pkgs.yq-go}/bin/yq -i '
.logs.channels.server.level = "warn" |
.logs.channels.jobs.level = "warn"
' "$rr_config_path"
chmod "$original_mode" "$rr_config_path"
''; '';
shlink-cli = pkgs.writeShellApplication { shlink-cli = pkgs.writeShellApplication {