From 4d564c3203206798aa9188a0403fe048def74d63 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Fri, 19 Jul 2024 12:48:14 +0200 Subject: [PATCH] nix/fossbeamer: use wrapGAppsHook instead of manual wrapper in cage This fixes font sizes. --- nix/overlay.nix | 11 +++++++++++ nix/profiles/kiosk.nix | 8 -------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/nix/overlay.nix b/nix/overlay.nix index 62ee795..df659f3 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -28,6 +28,17 @@ self: pkgs: rec { pkgs.defaultCrateOverrides // { fossbeamer = prev: { src = filterRustCrateSrc { root = prev.src.origSrc; }; + + nativeBuildInputs = [ pkgs.wrapGAppsHook ]; + buildInputs = with pkgs; [ + glib-networking + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-libav + ]); }; }; }; diff --git a/nix/profiles/kiosk.nix b/nix/profiles/kiosk.nix index fd1213e..de5d83d 100644 --- a/nix/profiles/kiosk.nix +++ b/nix/profiles/kiosk.nix @@ -15,14 +15,6 @@ ${pkgs.fossbeamer}/bin/fossbeamer --default-config=${../../default-config.json} https://wip.bar ''; environment = { - GST_PLUGIN_SYSTEM_PATH_1_0 = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with pkgs.gst_all_1;[ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-bad - gst-libav - ]); - GIO_MODULE_DIR = "${pkgs.glib-networking}/lib/gio/modules/"; LIBGL_DEBUG = "verbose"; RUST_LOG = "debug"; };