diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index 9288043..c070043 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -56,6 +56,15 @@ }); }) + (final: prev: { + wineWowPackages.stagingFull = pkgs-stable.wineWowPackages.stagingFull.overrideAttrs (old: { + patches = [ ../../patches/wine-6006.patch ]; + waylandSupport = true; + fontconfigSupport = true; + vulkanSupport = true; + }); + }) + # adds newer bitwig version package. i'm sure this is a hack, but it works. (final: prev: { bitwig-studio5-3 = pkgs-local.bitwig-studio.bitwig-bubblewrap.override { diff --git a/overlays/yabridge.nix b/overlays/yabridge.nix index d257905..a091f2f 100644 --- a/overlays/yabridge.nix +++ b/overlays/yabridge.nix @@ -10,14 +10,14 @@ final: prev: { patches = [ # Hard code bitbridge & runtime dependencies - (prev.replaceVars ./hardcode-dependencies.patch { + (prev.replaceVars ../patches/hardcode-dependencies.patch { libdbus = prev.pkgs.dbus.lib; libxcb32 = prev.pkgsi686Linux.xorg.libxcb; - # inherit prev.wine; + wine = prev.wine; }) # Patch the chainloader to search for libyabridge through NIX_PROFILES - ./libyabridge-from-nix-profiles.patch + ../patches/libyabridge-from-nix-profiles.patch ]; }); @@ -25,12 +25,4 @@ final: prev: { yabridgectl = prev.yabridge.overrideAttrs (old: { cargoHash = ""; }); - - wineWowPackages.stagingFull = prev.pkgs-stable.wineWowPackages.stagingFull.overrideAttrs - (old: { - patches = [ ./wine-6006.patch ]; - waylandSupport = true; - fontconfigSupport = true; - vulkanSupport = true; - }); } diff --git a/overlays/hardcode-dependencies.patch b/patches/hardcode-dependencies.patch similarity index 100% rename from overlays/hardcode-dependencies.patch rename to patches/hardcode-dependencies.patch diff --git a/overlays/libyabridge-from-nix-profiles.patch b/patches/libyabridge-from-nix-profiles.patch similarity index 100% rename from overlays/libyabridge-from-nix-profiles.patch rename to patches/libyabridge-from-nix-profiles.patch diff --git a/overlays/wine-6006.patch b/patches/wine-6006.patch similarity index 100% rename from overlays/wine-6006.patch rename to patches/wine-6006.patch