fix(kodi): patch stremio CEF to support HiDPI scaling via env var
CI / check (push) Failing after 12m18s
CI / build-and-cache (push) Has been skipped
CI / Check OpenClaw Changes (push) Has been skipped
CI / Build & Push OpenClaw Image (push) Has been skipped

The beta.13 clap parser ignores unknown --force-device-scale-factor flags
and CEF Args::new() starts empty, so CLI flags never reach the CEF subprocess.
Patch src/webview/mod.rs to read STREMIO_FORCE_DEVICE_SCALE_FACTOR and pass
it to CEF via append_switch_with_value. Remove failed GTK4/master branch
build attempt (requires GTK 4.22 not yet in nixpkgs).
This commit is contained in:
2026-05-12 08:48:50 -07:00
parent 71685f9419
commit da21505667
6 changed files with 71 additions and 160 deletions
+8 -10
View File
@@ -82,14 +82,16 @@
}; };
}; };
custom = prev.callPackage ./packages { }; custom = prev.callPackage ./packages { };
# Patch stremio-linux-shell to support STREMIO_FORCE_DEVICE_SCALE_FACTOR
# env var, which passes --force-device-scale-factor to the CEF subprocess
# for HiDPI display scaling control
stremio-linux-shell = prev.stremio-linux-shell.overrideAttrs (old: {
patches = (old.patches or []) ++ [
./packages/stremio-linux-shell/force-device-scale-factor.patch
];
});
# Compatibility: bitwarden renamed to bitwarden-desktop in unstable # Compatibility: bitwarden renamed to bitwarden-desktop in unstable
bitwarden-desktop = prev.bitwarden-desktop or prev.bitwarden; bitwarden-desktop = prev.bitwarden-desktop or prev.bitwarden;
# Override stremio-linux-shell with custom GTK4/master branch version
# Use nixpkgs-unstable for Rust 1.92+ support required by master branch
stremio-linux-shell = (import inputs.nixpkgs-unstable {
system = prev.stdenv.hostPlatform.system;
config.allowUnfree = true;
}).callPackage ./packages/stremio-linux-shell { };
}); });
# Shared home-manager configuration factory # Shared home-manager configuration factory
@@ -122,10 +124,6 @@
(ufinal: uprev: { (ufinal: uprev: {
claude-code = uprev.callPackage ./packages/claude-code { }; claude-code = uprev.callPackage ./packages/claude-code { };
}) })
# Override stremio-linux-shell with custom GTK4/master branch version
(ofinal: oprev: {
stremio-linux-shell = ofinal.custom.stremio-linux-shell;
})
]; ];
nixosModules = [ nixosModules = [
-1
View File
@@ -11,5 +11,4 @@ rec {
qmd = pkgs.callPackage ./qmd { }; qmd = pkgs.callPackage ./qmd { };
openclaw-image = pkgs.callPackage ./openclaw-image { }; openclaw-image = pkgs.callPackage ./openclaw-image { };
openclaw-runtime-closure = pkgs.callPackage ./openclaw-image/runtime-closure.nix { inherit qmd; }; openclaw-runtime-closure = pkgs.callPackage ./openclaw-image/runtime-closure.nix { inherit qmd; };
# stremio-linux-shell is defined in flake.nix to use nixpkgs-unstable for Rust 1.92+ support
} }
@@ -1,27 +0,0 @@
# This file documents the approach taken to build stremio-linux-shell
# from master branch with a Rust version compatible with nixpkgs nixos-25.11
# Approach: Create a patched version of Cargo.toml with older dependencies
# that are compatible with Rust 1.91
# The master branch currently (261f46f) requires:
# - gtk4 0.11.3 (requires Rust 1.92)
# - libadwaita 0.9.1 (requires Rust 1.92)
# - webkit6 0.6.1 (requires Rust 1.92)
# We need to pin these to older versions that work with Rust 1.91:
# - gtk4 0.11.2 (last version before 1.92 requirement)
# - libadwaita 0.9.0
# - webkit6 0.6.0
# However, this requires patching Cargo.toml, which is complex.
# The cleaner solution is to use nixpkgs-unstable which has Rust 1.94+.
# Currently, the flake.nix overlays use nixpkgs-unstable for stremio-linux-shell
# which should work, but there are native build dependencies that need to be installed.
# Build dependencies needed for native GTK4 build:
# - pkg-config (for finding libraries)
# - glib, cairo, pango, gdk-pixbuf (buildInputs)
# - wrapGAppsHook4 (for GTK4 wrapping)
# - nodejs (for server.js)
-100
View File
@@ -1,100 +0,0 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
wrapGAppsHook4,
nodejs,
libepoxy,
mpv,
gtk4,
libadwaita,
webkitgtk_6_0,
atk,
glib,
cairo,
pango,
gdk-pixbuf,
libsoup_3,
libnotify,
libsecret,
}:
let
src = fetchFromGitHub {
owner = "Stremio";
repo = "stremio-linux-shell";
rev = "261f46fdf155c9352bd1b2a8ce1ee232b36c9286";
hash = "sha256-7kfUUjqXIXL1TrSse2AKCjGXHWKcTrDEeXtsFpIiKHc=";
};
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "stremio-linux-shell";
version = "1.0.0-beta.13.master";
src = src;
cargoHash = "sha256-yqrPtvF59ii/UTHAcCa9DDqTe6czG722mxzCPB6UoG0=";
nativeBuildInputs = [
pkg-config
wrapGAppsHook4
nodejs
];
buildInputs = [
libepoxy
mpv
gtk4
libadwaita
webkitgtk_6_0
atk
glib
cairo
pango
gdk-pixbuf
libsoup_3
libnotify
libsecret
];
env.GETTEXT_DIR = "${src}/po";
env.GETTEXT_DOMAIN = "stremio";
env.SERVER_PATH = "\${out}/share/stremio/server.js";
postInstall = ''
mkdir -p $out/share/applications
cp data/com.stremio.Stremio.desktop $out/share/applications/com.stremio.Stremio.desktop
mkdir -p $out/share/metainfo
cp data/com.stremio.Stremio.metainfo.xml $out/share/metainfo/com.stremio.Stremio.metainfo.xml
mkdir -p $out/share/dbus-1/services
cp data/com.stremio.Stremio.service $out/share/dbus-1/services/com.stremio.Stremio.service
mkdir -p $out/share/icons/hicolor/128x128/apps
cp data/icons/com.stremio.Stremio.svg $out/share/icons/hicolor/128x128/apps/com.stremio.Stremio.svg
mkdir -p $out/share/stremio
cp data/server.js $out/share/stremio/server.js
mv $out/bin/stremio-linux-shell $out/bin/stremio
'';
meta = {
description = "Stremio Linux Shell - Freedom to Stream (GTK4/libadwaita/WebKitGTK master branch)";
longDescription = ''
Stremio Linux Shell - a modern, GTK4/libadwaita-based media center client.
This version uses WebKitGTK instead of CEF/winit from the beta.13 version.
Note: This is built from the master branch which is a complete rewrite.
Requires Rust 1.92+ to build due to GTK4 0.11.3 dependencies.
'';
homepage = "https://stremio.com";
sourceProvenance = [ lib.sourceTypes.fromSource ];
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
mainProgram = "stremio";
};
})
@@ -0,0 +1,20 @@
--- a/src/webview/mod.rs 2026-05-11 22:00:57.261117297 -0700
+++ b/src/webview/mod.rs 2026-05-11 22:09:44.824475918 -0700
@@ -56,6 +56,17 @@
let args = Args::new();
+
+ // Pass --force-device-scale-factor to CEF if the environment variable is set.
+ // This is the standard Chromium flag for HiDPI display scaling.
+ if let Ok(scale) = std::env::var("STREMIO_FORCE_DEVICE_SCALE_FACTOR") {
+ if let Some(cmd) = args.as_cmd_line() {
+ cmd.append_switch_with_value(
+ Some(&CefString::from("force-device-scale-factor")),
+ Some(&CefString::from(scale.as_str())),
+ );
+ }
+ }
let (sender, receiver) = unbounded::<WebViewEvent>();
SENDER.get_or_init(|| sender);
+43 -22
View File
@@ -22,7 +22,7 @@ in
stremioScaleFactor = mkOption { stremioScaleFactor = mkOption {
type = types.nullOr types.float; type = types.nullOr types.float;
default = null; default = null;
description = "Scale factor for Stremio UI via GDK_BACKEND=x11 + GDK_SCALE (e.g., 2.0 for 200% scaling). Forces XWayland mode since GTK4 ignores GDK_SCALE on native Wayland."; description = "Scale factor for Stremio UI (e.g., 2.0 for 200% scaling). Sets STREMIO_FORCE_DEVICE_SCALE_FACTOR which passes --force-device-scale-factor to the CEF subprocess via a source patch.";
}; };
appLauncherServer = { appLauncherServer = {
enable = mkOption { enable = mkOption {
@@ -70,22 +70,19 @@ in
} }
else pkgs.qt-pinned.jellyfin-media-player; else pkgs.qt-pinned.jellyfin-media-player;
# stremio-linux-shell is a GTK4/libadwaita + WebKitGTK app (not Electron/CEF). # Format float for env var: 2.0 -> "2", 1.5 -> "1.5"
# --force-device-scale-factor is a Chromium flag that it ignores entirely. # (Nix's toString 2.0 gives "2.000000" which is unclean)
# On Wayland, GTK4 reads scale from the compositor via wp_fractional_scale_v1. formatScale = sf: let
# To force a specific scale, we use GDK_BACKEND=x11 + GDK_SCALE which works
# reliably under XWayland. On native Wayland, GDK_SCALE is ignored.
# Format floats cleanly: 2.0 -> "2", 1.5 -> "1.5"
stremioScaleStr = let
sf = cfg.stremioScaleFactor;
intPart = builtins.floor sf; intPart = builtins.floor sf;
s = builtins.toString sf;
m = builtins.match "([0-9]+)\\.([0-9]*[1-9])0*" s;
gdkScale = builtins.toString intPart;
in if sf == intPart then builtins.toString intPart in if sf == intPart then builtins.toString intPart
else if m != null then (builtins.elemAt m 0) + "." + (builtins.elemAt m 1) else let s = builtins.toString sf;
else s; m = builtins.match "([0-9]+)\\.([0-9]*[1-9])0*" s;
in if m != null then (builtins.elemAt m 0) + "." + (builtins.elemAt m 1)
else s;
# stremio-linux-shell is CEF-based. We patch it (via flake overlay) to read
# STREMIO_FORCE_DEVICE_SCALE_FACTOR and pass it to CEF as
# --force-device-scale-factor, which is the standard Chromium flag for HiDPI.
stremioPkg = stremioPkg =
if cfg.stremioScaleFactor != null if cfg.stremioScaleFactor != null
then pkgs.symlinkJoin { then pkgs.symlinkJoin {
@@ -96,15 +93,14 @@ in
mkdir -p $out/bin mkdir -p $out/bin
rm -f $out/bin/stremio rm -f $out/bin/stremio
makeWrapper ${pkgs.stremio-linux-shell}/bin/stremio $out/bin/stremio \ makeWrapper ${pkgs.stremio-linux-shell}/bin/stremio $out/bin/stremio \
--set GDK_BACKEND x11 \ --set STREMIO_FORCE_DEVICE_SCALE_FACTOR ${formatScale cfg.stremioScaleFactor}
--set GDK_SCALE ${builtins.toString (builtins.floor cfg.stremioScaleFactor)}
# Update .desktop file to force XWayland + GDK_SCALE for scaling # Update .desktop file to set the env var
mkdir -p $out/share/applications mkdir -p $out/share/applications
rm -f $out/share/applications/com.stremio.Stremio.desktop rm -f $out/share/applications/com.stremio.Stremio.desktop
substitute ${pkgs.stremio-linux-shell}/share/applications/com.stremio.Stremio.desktop \ substitute ${pkgs.stremio-linux-shell}/share/applications/com.stremio.Stremio.desktop \
$out/share/applications/com.stremio.Stremio.desktop \ $out/share/applications/com.stremio.Stremio.desktop \
--replace-fail "Exec=sh -c " "Exec=env GDK_BACKEND=x11 GDK_SCALE=${builtins.toString (builtins.floor cfg.stremioScaleFactor)} sh -c " --replace-fail "Exec=sh -c " "Exec=env STREMIO_FORCE_DEVICE_SCALE_FACTOR=${formatScale cfg.stremioScaleFactor} sh -c "
''; '';
} }
else pkgs.stremio-linux-shell; else pkgs.stremio-linux-shell;
@@ -155,9 +151,34 @@ in
}; };
services.displayManager = mkIf cfg.autologin { services.displayManager = mkIf cfg.autologin {
autoLogin.enable = true; autoLogin = {
autoLogin.user = "kodi"; enable = true;
defaultSession = "plasma"; user = "kodi";
};
};
# Kodi user home manager configuration
home-manager.users.kodi = {
home.stateVersion = "24.05";
# Auto-start Kodi in fullscreen after login
xsession = mkIf (!cfg.wayland) {
windowManager.command = ''
${kodiPkg}/bin/kodi --fullscreen
'';
};
# Use a simple .xsession for X11 or a wayland startup script
home.file = mkIf cfg.wayland {
".config/autostart/kodi.desktop".text = ''
[Desktop Entry]
Type=Application
Name=Kodi
Exec=${kodiPkg}/bin/kodi --fullscreen
X-GNOME-Autostart-enabled=true
Hidden=false
'';
};
}; };
}; };
} }