nix/fossbeamer: use wrapGAppsHook instead of manual wrapper in cage

This fixes font sizes.
wipbar · Jul 19, 2024 · 4d564c3 · 4d564c3
1 parent bf062c7
commit 4d564c3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git 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
@@ -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";
     };