From d51bb396597dda7eeb5e5caf196b051fcec64e76 Mon Sep 17 00:00:00 2001 From: brian Date: Tue, 3 Mar 2026 21:09:34 -0500 Subject: [PATCH] working --- default.nix | 2 +- pinepods.nix | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index 483bbfb..acf8187 100644 --- a/default.nix +++ b/default.nix @@ -5,7 +5,7 @@ in { pinepods = pkgs.callPackage ./pinepods.nix { wasm-bindgen-cli = pkgs.wasm-bindgen-cli_0_2_105; - inherit (pkgs) binaryen tailwindcss_3; + inherit (pkgs) binaryen tailwindcss_3 libayatana-appindicator gst_all_1; }; pinepods-frontend = (pkgs.callPackage ./pinepods.nix { }).frontend; } \ No newline at end of file diff --git a/pinepods.nix b/pinepods.nix index 6185738..7585aad 100644 --- a/pinepods.nix +++ b/pinepods.nix @@ -25,6 +25,7 @@ , trunk , makeWrapper , libayatana-appindicator +, gst_all_1 }: let @@ -85,7 +86,7 @@ rustPlatform.buildRustPackage { sourceRoot = "source/web/src-tauri"; cargoRoot = "."; - cargoExtraArgs = "--bin app"; + cargoExtraArgs = "--bin app --features custom-protocol"; cargoLock = { lockFile = ./Cargo.lock; @@ -114,6 +115,12 @@ rustPlatform.buildRustPackage { glib-networking gsettings-desktop-schemas libayatana-appindicator + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav # for audio codec support ]; OPENSSL_NO_VENDOR = "1"; @@ -122,6 +129,11 @@ rustPlatform.buildRustPackage { preBuild = '' chmod -R u+w $NIX_BUILD_TOP/source ln -s ${frontend} $NIX_BUILD_TOP/source/web/dist + + # Remove devUrl so Tauri uses frontendDist instead of dev server + sed -i '/"devUrl"/d' $NIX_BUILD_TOP/source/web/src-tauri/tauri.conf.json + echo "=== tauri.conf.json ===" + cat $NIX_BUILD_TOP/source/web/src-tauri/tauri.conf.json | head -10 ''; installPhase = '' @@ -146,7 +158,9 @@ rustPlatform.buildRustPackage { postFixup = '' wrapProgram $out/bin/pinepods \ --set WEBKIT_DISABLE_COMPOSITING_MODE 1 \ + --set WEBKIT_FORCE_SANDBOX 0 \ --prefix LD_LIBRARY_PATH : "${libayatana-appindicator}/lib" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "${gst_all_1.gst-plugins-base}/lib/gstreamer-1.0:${gst_all_1.gst-plugins-good}/lib/gstreamer-1.0:${gst_all_1.gst-plugins-bad}/lib/gstreamer-1.0:${gst_all_1.gst-plugins-ugly}/lib/gstreamer-1.0:${gst_all_1.gst-libav}/lib/gstreamer-1.0" \ --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}" \ --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" '';