working
This commit is contained in:
@@ -5,7 +5,7 @@ in
|
|||||||
{
|
{
|
||||||
pinepods = pkgs.callPackage ./pinepods.nix {
|
pinepods = pkgs.callPackage ./pinepods.nix {
|
||||||
wasm-bindgen-cli = pkgs.wasm-bindgen-cli_0_2_105;
|
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;
|
pinepods-frontend = (pkgs.callPackage ./pinepods.nix { }).frontend;
|
||||||
}
|
}
|
||||||
16
pinepods.nix
16
pinepods.nix
@@ -25,6 +25,7 @@
|
|||||||
, trunk
|
, trunk
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, libayatana-appindicator
|
, libayatana-appindicator
|
||||||
|
, gst_all_1
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@@ -85,7 +86,7 @@ rustPlatform.buildRustPackage {
|
|||||||
|
|
||||||
sourceRoot = "source/web/src-tauri";
|
sourceRoot = "source/web/src-tauri";
|
||||||
cargoRoot = ".";
|
cargoRoot = ".";
|
||||||
cargoExtraArgs = "--bin app";
|
cargoExtraArgs = "--bin app --features custom-protocol";
|
||||||
|
|
||||||
cargoLock = {
|
cargoLock = {
|
||||||
lockFile = ./Cargo.lock;
|
lockFile = ./Cargo.lock;
|
||||||
@@ -114,6 +115,12 @@ rustPlatform.buildRustPackage {
|
|||||||
glib-networking
|
glib-networking
|
||||||
gsettings-desktop-schemas
|
gsettings-desktop-schemas
|
||||||
libayatana-appindicator
|
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";
|
OPENSSL_NO_VENDOR = "1";
|
||||||
@@ -122,6 +129,11 @@ rustPlatform.buildRustPackage {
|
|||||||
preBuild = ''
|
preBuild = ''
|
||||||
chmod -R u+w $NIX_BUILD_TOP/source
|
chmod -R u+w $NIX_BUILD_TOP/source
|
||||||
ln -s ${frontend} $NIX_BUILD_TOP/source/web/dist
|
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 = ''
|
installPhase = ''
|
||||||
@@ -146,7 +158,9 @@ rustPlatform.buildRustPackage {
|
|||||||
postFixup = ''
|
postFixup = ''
|
||||||
wrapProgram $out/bin/pinepods \
|
wrapProgram $out/bin/pinepods \
|
||||||
--set WEBKIT_DISABLE_COMPOSITING_MODE 1 \
|
--set WEBKIT_DISABLE_COMPOSITING_MODE 1 \
|
||||||
|
--set WEBKIT_FORCE_SANDBOX 0 \
|
||||||
--prefix LD_LIBRARY_PATH : "${libayatana-appindicator}/lib" \
|
--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 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"
|
--prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules"
|
||||||
'';
|
'';
|
||||||
|
|||||||
Reference in New Issue
Block a user