From 8f87cf30d6c2bc103379243047e6dfdc15cf8da4 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Wed, 19 Mar 2025 22:19:35 -0700 Subject: [PATCH] feat: adjust wine settings and fix yabridge --- modules/linux/audio-prod/default.nix | 10 ++++++++-- modules/linux/wine/default.nix | 5 ----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/linux/audio-prod/default.nix b/modules/linux/audio-prod/default.nix index d82f1b9..6c29662 100644 --- a/modules/linux/audio-prod/default.nix +++ b/modules/linux/audio-prod/default.nix @@ -7,6 +7,12 @@ let cfg = config.liminalOS.system.audio.prod; forAllUsers = lib.genAttrs cfg.realtimeAudioUsers; + wine = pkgs.wineWowPackages.full; + overrideWine = + package: + (package.override { + inherit wine; + }); in { options.liminalOS.system.audio.prod = { @@ -31,8 +37,8 @@ in environment.systemPackages = lib.mkIf cfg.enable ( (with pkgs; [ - yabridge - yabridgectl + (overrideWine yabridge) + (overrideWine yabridgectl) alsa-scarlett-gui ]) ++ (lib.optionals config.liminalOS.config.allowUnfree ( diff --git a/modules/linux/wine/default.nix b/modules/linux/wine/default.nix index 1e9479b..89c69cb 100644 --- a/modules/linux/wine/default.nix +++ b/modules/linux/wine/default.nix @@ -18,10 +18,5 @@ in wine ] ); - nixpkgs.overlays = [ - (self: super: { - wine = super.wineWowPackages.stable; - }) - ]; }; }