From ad16b47827375237457194fd300ba0590b752334 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Fri, 9 Jan 2026 15:49:15 -0600 Subject: [PATCH] librepods rust --- .../x86_64-linux/admin@jallen-nas/default.nix | 4 +- modules/nixos/services/sunshine/default.nix | 18 +++---- packages/librepods-beta/default.nix | 51 +++++++------------ systems/x86_64-linux/jallen-nas/apps.nix | 2 +- 4 files changed, 30 insertions(+), 45 deletions(-) diff --git a/homes/x86_64-linux/admin@jallen-nas/default.nix b/homes/x86_64-linux/admin@jallen-nas/default.nix index 960bb3f..ce54884 100755 --- a/homes/x86_64-linux/admin@jallen-nas/default.nix +++ b/homes/x86_64-linux/admin@jallen-nas/default.nix @@ -66,8 +66,8 @@ # Optional: override default paths if needed environmentVariables = { - romsDirectory = "/home/deck/Emulation/roms"; - steamDirectory = "/home/deck/.local/share/Steam"; + romsDirectory = "/home/admin/Emulation/roms"; + steamDirectory = "/home/admin/.local/share/Steam"; }; emulators = { diff --git a/modules/nixos/services/sunshine/default.nix b/modules/nixos/services/sunshine/default.nix index 2e9580a..2ccd42a 100644 --- a/modules/nixos/services/sunshine/default.nix +++ b/modules/nixos/services/sunshine/default.nix @@ -25,17 +25,17 @@ let name = "steam"; prep-cmd = [ { - do = "${pkgs.cosmic-randr}/bin/cosmic-randr mode HDMI-A-1 1280 800"; - undo = "${pkgs.cosmic-randr}/bin/cosmic-randr mode HDMI-A-1 1920 1080"; + do = "${pkgs.cosmic-randr}/bin/cosmic-randr mode HDMI-A-3 1280 800"; + undo = "${pkgs.cosmic-randr}/bin/cosmic-randr mode HDMI-A-3 1920 1080"; } { - do = "${pkgs.util-linux}/bin/setsid ${pkgs.steam}/bin/steam steam://open/bigpicture"; - undo = "${pkgs.util-linux}/bin/setsid ${pkgs.steam}/bin/steam steam://close/bigpicture"; + # do = ''"${pkgs.util-linux}/bin/setsid ${pkgs.steam}/bin/steam steam://open/bigpicture"''; + undo = ''"${pkgs.util-linux}/bin/setsid ${pkgs.steam}/bin/steam steam://close/bigpicture"''; } ]; - # detached = [ - # "${pkgs.steam}/bin/steam steam://open/bigpicture" - # ]; + detached = [ + " steam-run steam steam://open/bigpicture" + ]; exclude-global-prep-cmd = "false"; auto-detach = "true"; } @@ -43,8 +43,8 @@ let name = "800p Desktop"; prep-cmd = [ { - do = "${pkgs.cosmic-randr}/bin/cosmic-randr mode HDMI-A-1 1280 800"; - undo = "${pkgs.cosmic-randr}/bin/cosmic-randr mode HDMI-A-1 1920 1080"; + do = "${pkgs.cosmic-randr}/bin/cosmic-randr mode HDMI-A-3 1280 800"; + undo = "${pkgs.cosmic-randr}/bin/cosmic-randr mode HDMI-A-3 1920 1080"; } ]; exclude-global-prep-cmd = "false"; diff --git a/packages/librepods-beta/default.nix b/packages/librepods-beta/default.nix index e06b9fb..a4e0a69 100644 --- a/packages/librepods-beta/default.nix +++ b/packages/librepods-beta/default.nix @@ -4,17 +4,17 @@ fetchFromGitHub, pkg-config, makeWrapper, + autoPatchelfHook, dbus, libpulseaudio, - gtk4, - libadwaita, - glib, - bluez, wayland, libxkbcommon, libGL, vulkan-loader, xorg, + expat, + fontconfig, + freetype, gsettings-desktop-schemas, }: @@ -25,8 +25,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "kavishdevar"; repo = "librepods"; - rev = "4737cbfc2c1a4e227e42d095c49ab43bd8d7b64a"; - hash = "sha256-5vPCtjUiFSI/Ix5dbGmR3TGQsYIwWAUHMwx8yH6HXac="; + rev = "c852b726deb5344ea3637332722a7c93f3858d60"; + hash = "sha256-RoOkINI+ahepAbgwdkcl1iI9XGI/gYXWiH0J9Eb90pg="; }; sourceRoot = "${src.name}/linux-rust"; @@ -35,46 +35,31 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config + libpulseaudio + autoPatchelfHook makeWrapper ]; buildInputs = [ dbus libpulseaudio - gtk4 - libadwaita - glib - bluez wayland - libxkbcommon + expat + fontconfig + freetype + freetype.dev libGL - vulkan-loader + pkg-config xorg.libX11 xorg.libXcursor - xorg.libXrandr xorg.libXi - gsettings-desktop-schemas + xorg.libXrandr + wayland + libxkbcommon ]; - # Create wrapper script instead of wrapping in-place - postInstall = '' - mv $out/bin/librepods $out/bin/.librepods-unwrapped - - makeWrapper $out/bin/.librepods-unwrapped $out/bin/librepods \ - --prefix LD_LIBRARY_PATH : "${ - lib.makeLibraryPath [ - wayland - libxkbcommon - libGL - vulkan-loader - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXi - ] - }" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --set GDK_BACKEND "wayland,x11" + postFixup = '' + wrapProgram $out/bin/librepods --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs} ''; meta = with lib; { diff --git a/systems/x86_64-linux/jallen-nas/apps.nix b/systems/x86_64-linux/jallen-nas/apps.nix index 789e733..3f64fe9 100755 --- a/systems/x86_64-linux/jallen-nas/apps.nix +++ b/systems/x86_64-linux/jallen-nas/apps.nix @@ -71,7 +71,7 @@ in apiKey = config.sops.secrets."jallen-nas/crowdsec-capi".path; }; dispatcharr = { - enable = true; + enable = false; port = 9191; }; ersatztv = {