moved to main branch temporarily. updated wine for yabridge

This commit is contained in:
Matt Nish-Lapidus 2025-06-21 18:38:07 -04:00
parent 1475c512e3
commit c7069c3b78
4 changed files with 8 additions and 7 deletions

8
flake.lock generated
View file

@ -1156,16 +1156,16 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1750134718, "lastModified": 1750523110,
"narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "narHash": "sha256-6rpunQamYOQcM1wWUgQ9uZwAm/6hji4qT7klW/1wY+w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "rev": "47a0645979bd642dcd860d332963b32587ede0f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "master",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View file

@ -3,7 +3,7 @@
inputs = { inputs = {
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/master";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";

View file

@ -58,7 +58,7 @@
(final: prev: { (final: prev: {
wineWowPackages.yabridge = prev.wineWowPackages.yabridge.overrideAttrs (old: { wineWowPackages.yabridge = prev.wineWowPackages.yabridge.overrideAttrs (old: {
patches = [ ../../patches/wine-6006.patch ]; patches = [ ../../patches/wine-6006.patch ] ++ old.patches;
waylandSupport = true; waylandSupport = true;
fontconfigSupport = true; fontconfigSupport = true;
vulkanSupport = true; vulkanSupport = true;

View file

@ -1,4 +1,4 @@
{ pkgs-local, pkgs, ... }: { pkgs-local, pkgs-stable, pkgs, ... }:
let let
pwdcmd = "${pkgs-local.rbw-latest}/bin/rbw"; pwdcmd = "${pkgs-local.rbw-latest}/bin/rbw";
in in
@ -65,6 +65,7 @@ in
msmtp.enable = true; msmtp.enable = true;
thunderbird = { thunderbird = {
enable = true; enable = true;
package = pkgs-stable.thunderbird;
profiles.emenel = { profiles.emenel = {
isDefault = true; isDefault = true;
}; };