mirror of
https://github.com/Psychotoxical/psysonic.git
synced 2026-07-21 14:55:43 +00:00
70c2fdfbf9
* feat(linux): session GDK defaults, nvidia-quirk, optional x11-legacy wrap Ship PSYSONIC_ALLOW_NATIVE_GDK from Nix/AUR instead of pinning WEBKIT_DISABLE_* and GDK x11. Add flake psysonic-x11-legacy for the old wrap; alias gdk-session to psysonic. Startup uses webkit2gtk-nvidia-quirk and Wayland-aware compositing; refresh Help (a45) and nixos-install docs. * fix(linux): session GDK and nvidia-quirk only; drop wrapper env heuristics Remove PSYSONIC_ALLOW_NATIVE_GDK and devShell GDK/WEBKIT exports; stop synthesizing GDK/WebKit vars in main.rs. Update Nix/AUR wrappers, install docs, CHANGELOG, and help FAQ with practical user-facing workarounds. * fix(linux): X11-pinned GDK uses DMABUF quirk path, not Wayland explicit-sync When GDK_BACKEND is forced to x11 on a wayland user session, webkit2gtk-nvidia-quirk would still apply __NV_DISABLE_EXPLICIT_SYNC and gray out the webview. Map that case to WEBKIT_DISABLE_DMABUF_RENDERER like native X11. * fix(ui): stabilize WebKitGTK/Wayland hover paint for nav and media cards Sidebar nav links avoid transition:all and promote icons with translateZ(0). Artist rows and album/artist/song cards use compositing hints; card shadows and borders no longer interpolate so cover zoom can stay smooth without jitter. * fix(ui): isolate artist/album card text and cover paint on WebKitGTK Promote cover blocks with contain/paint and text stacks with translateZ(0); use artist-card-info on the artists grid for the same layout as other cards. * feat(artists): in-page overlay scroll and locked main viewport Move list/grid into an inner OverlayScrollArea, stop sticky toolbar from owning the route scroll, align the rail with the main panel edge, and skip the main-route overlay thumb when the viewport cannot scroll vertically. * feat(browse): extend in-page overlay scroll to more library routes Reuse the locked main viewport pattern from Artists for Albums, Composers, Lossless albums, and New releases; wire VirtualCardGrid and scroll chrome to the matching in-page viewport ids. * fix(linux): improve Wayland GPU compositing text clarity in WebKitGTK Use on-demand hardware acceleration on main and mini webviews when the session is Wayland and compositing stays on; gate subpixel body AA on the same conditions via new Tauri probes. Document PSYSONIC_SKIP_WAYLAND_FONT_TUNING for opt-out and changelog. * fix(rust): satisfy clippy needless_return in Linux webkit helpers * fix(linux): tune Wayland text rendering with HW policy env and CSS Allow PSYSONIC_WEBKIT_WAYLAND_HW_POLICY to select WebKit hardware acceleration policy (never/always vs default on-demand). Extend Wayland font CSS to #root with geometricPrecision and text-size-adjust on html. * feat(linux): Wayland text presets in settings, safe WebKit apply, CPU default Persist profile to app config; apply WebKit policy at startup/mini only to avoid WebKitGTK hangs on live toggles. UI + CSS preview stays live; default preset is sharp (CPU-friendly). * fix(linux): map Wayland sharp preset to OnDemand WebKit policy HardwareAccelerationPolicy::Never at startup broke main-viewport wheel scrolling on WebKitGTK+Wayland; sharp vs balanced remains a CSS AA path. Use PSYSONIC_WEBKIT_WAYLAND_HW_POLICY for a true Never policy. * fix(rust): gate Linux-only Wayland WebKit helpers for Windows builds Re-export startup helpers only under cfg(linux) and drop non-Linux stubs so Windows compiles without unused-import and dead-code warnings. * chore(release): CHANGELOG + credits for Linux session/WebKit work (PR #731) Consolidate scattered incremental changelog notes into two [1.47.0] entries with PR link; remove duplicate Linux blocks from [1.46.0] Fixed. Append settings credit line for cucadmuh.
185 lines
4.5 KiB
Nix
185 lines
4.5 KiB
Nix
# Installable Psysonic (Tauri): npm build → cargo tauri build --no-bundle.
|
|
# Source: `self` (this repo). Package version is read from package.json.
|
|
# `npmDepsHash` in nix/upstream-sources.json is refreshed by the release
|
|
# workflow (see .github/workflows/release.yml, verify-nix job).
|
|
|
|
{
|
|
lib,
|
|
stdenv,
|
|
fetchNpmDeps,
|
|
npmHooks,
|
|
rustPlatform,
|
|
cargo,
|
|
rustc,
|
|
pkg-config,
|
|
cmake,
|
|
openssl,
|
|
gtk3,
|
|
webkitgtk_4_1,
|
|
libsoup_3,
|
|
glib-networking,
|
|
alsa-lib,
|
|
libayatana-appindicator,
|
|
atk,
|
|
cairo,
|
|
gdk-pixbuf,
|
|
glib,
|
|
pango,
|
|
librsvg,
|
|
cargo-tauri,
|
|
nodejs,
|
|
makeWrapper,
|
|
wrapGAppsHook4,
|
|
copyDesktopItems,
|
|
makeDesktopItem,
|
|
gst_all_1,
|
|
src,
|
|
upstreamMeta,
|
|
# When true, wrapProgram sets GDK_BACKEND=x11 (legacy conservative stack).
|
|
# When false (default), only lib paths — GDK follows session; binary applies webkit2gtk-nvidia-quirk only.
|
|
forceGdkX11 ? false,
|
|
}:
|
|
|
|
let
|
|
version = (lib.importJSON (src + "/package.json")).version;
|
|
# WebKit media stack needs discoverable GStreamer plugins (e.g. appsink in gst-plugins-base).
|
|
gstPlugins = with gst_all_1; [
|
|
gstreamer
|
|
gst-plugins-base
|
|
gst-plugins-good
|
|
gst-plugins-bad
|
|
];
|
|
gstPluginPath = lib.makeSearchPath "lib/gstreamer-1.0" gstPlugins;
|
|
srcClean = lib.cleanSourceWith {
|
|
inherit src;
|
|
filter =
|
|
path: _:
|
|
let
|
|
f = toString path;
|
|
in
|
|
!(lib.hasInfix "/node_modules/" f)
|
|
&& !(lib.hasInfix "/dist/" f)
|
|
&& !(lib.hasInfix "/target/" f)
|
|
&& !(lib.hasInfix "/.git/" f)
|
|
&& !(lib.hasInfix "/result/" f)
|
|
&& !(lib.hasInfix "/.flatpak-builder/" f)
|
|
&& !(lib.hasInfix "/.build-local/" f);
|
|
};
|
|
npmDeps = fetchNpmDeps {
|
|
src = srcClean;
|
|
hash = upstreamMeta.npmDepsHash;
|
|
};
|
|
cargoLockFile = src + "/src-tauri/Cargo.lock";
|
|
in
|
|
|
|
stdenv.mkDerivation (finalAttrs: {
|
|
pname = "psysonic";
|
|
inherit version;
|
|
src = srcClean;
|
|
inherit npmDeps;
|
|
|
|
strictDeps = true;
|
|
|
|
# cmake is only for Rust deps (e.g. libopus); no top-level CMakeLists.txt in repo root
|
|
dontUseCmakeConfigure = true;
|
|
|
|
nativeBuildInputs = [
|
|
npmHooks.npmConfigHook
|
|
cargo
|
|
rustc
|
|
rustPlatform.cargoSetupHook
|
|
pkg-config
|
|
cmake
|
|
makeWrapper
|
|
wrapGAppsHook4
|
|
copyDesktopItems
|
|
cargo-tauri
|
|
nodejs
|
|
];
|
|
|
|
buildInputs = [
|
|
gtk3
|
|
webkitgtk_4_1
|
|
libsoup_3
|
|
glib-networking
|
|
openssl
|
|
alsa-lib
|
|
libayatana-appindicator
|
|
atk
|
|
cairo
|
|
gdk-pixbuf
|
|
glib
|
|
pango
|
|
librsvg
|
|
]
|
|
++ gstPlugins;
|
|
|
|
cargoRoot = "src-tauri";
|
|
cargoDeps = rustPlatform.importCargoLock {
|
|
lockFile = cargoLockFile;
|
|
# Local path overrides for `[patch.crates-io]` entries in src-tauri/Cargo.toml.
|
|
# Keep in sync with that block — importCargoLock needs the source to match
|
|
# the lockfile entries for patched crates (otherwise it tries to fetch from
|
|
# crates.io and the hash mismatches).
|
|
outputHashes = { };
|
|
};
|
|
|
|
dontUseCargoParallelJobs = true;
|
|
|
|
env = {
|
|
OPENSSL_DIR = "${openssl.dev}";
|
|
OPENSSL_LIB_DIR = "${openssl.out}/lib";
|
|
OPENSSL_INCLUDE_DIR = "${openssl.dev}/include";
|
|
VITE_LASTFM_API_KEY = "";
|
|
VITE_LASTFM_API_SECRET = "";
|
|
};
|
|
|
|
# beforeBuildCommand runs npm run build; npmConfigHook supplies offline node_modules
|
|
buildPhase = ''
|
|
runHook preBuild
|
|
export HOME=$(mktemp -d)
|
|
(cd src-tauri && cargo tauri build --no-bundle -v)
|
|
runHook postBuild
|
|
'';
|
|
|
|
installPhase = ''
|
|
runHook preInstall
|
|
install -Dm755 src-tauri/target/release/psysonic -t $out/bin
|
|
install -Dm644 src-tauri/icons/128x128.png $out/share/icons/hicolor/128x128/apps/psysonic.png
|
|
runHook postInstall
|
|
'';
|
|
|
|
desktopItems = [
|
|
(makeDesktopItem {
|
|
name = "psysonic";
|
|
desktopName = "Psysonic";
|
|
comment = "Subsonic-compatible music player";
|
|
icon = "psysonic";
|
|
exec = "psysonic";
|
|
categories = [ "AudioVideo" "Audio" "Player" ];
|
|
})
|
|
];
|
|
|
|
postFixup =
|
|
let
|
|
gdkX11Wrap = lib.optionalString forceGdkX11 ''
|
|
--set GDK_BACKEND x11
|
|
'';
|
|
in
|
|
''
|
|
wrapProgram $out/bin/psysonic \
|
|
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libayatana-appindicator ]}" \
|
|
--prefix GST_PLUGIN_PATH : "${gstPluginPath}" \
|
|
--prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \
|
|
${gdkX11Wrap}
|
|
'';
|
|
|
|
meta = {
|
|
description = "Desktop music player for Subsonic-compatible servers";
|
|
homepage = "https://github.com/Psychotoxical/psysonic";
|
|
license = lib.licenses.gpl3Only;
|
|
mainProgram = "psysonic";
|
|
platforms = lib.platforms.linux;
|
|
};
|
|
})
|