Henry-Hiles/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix OBS, use OOYE fork

Browse source
This commit is contained in:
Henry Hiles 2025-06-20 23:18:57 -04:00
parent 6748c8aca9
commit 44d18ff827
No known key found for this signature in database
4 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.lock generated
View file

@ -829,17 +829,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749767813, "lastModified": 1750475211,
"narHash": "sha256-1vMSz6xcGc90rDo5BVdB/e6hbP+RrovyGNXhaUWrVKU=", "narHash": "sha256-M+qvH/Z4yl4SfEdce8egsm01NpLzUBT/bMWjcm5CL4Y=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "fe1e8f28844350efdce4b15342e69c82b1e3369a", "rev": "616ca2d32b610066d0dcf12496baa46f718dbdcd",
"revCount": 12, "revCount": 14,
"type": "git", "type": "git",
"url": "https://cgit.rory.gay/nix/OOYE-module.git" "url": "https://git.federated.nexus/Henry-Hiles/OOYE-module"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://cgit.rory.gay/nix/OOYE-module.git" "url": "https://git.federated.nexus/Henry-Hiles/OOYE-module"
} }
}, },
"programsdb": { "programsdb": {

2
flake.nix
View file

@ -15,7 +15,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
ooye = { ooye = {
url = "git+https://cgit.rory.gay/nix/OOYE-module.git"; url = "git+https://git.federated.nexus/Henry-Hiles/OOYE-module";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
matrixoidc = { matrixoidc = {

19
modules/desktop/obs.nix
View file

@ -1,6 +1,25 @@
{pkgs, ...}: { {pkgs, ...}: {
programs.obs-studio = { programs.obs-studio = {
enable = true; enable = true;
# TODO: For virtual camera, remove on new OBS release
package = pkgs.obs-studio.overrideAttrs (oldAttrs: {
src = pkgs.fetchFromGitHub {
owner = "obsproject";
repo = "obs-studio";
rev = "12c6febae21f369da50f09d511b54eadc1dc1342"; # https://github.com/obsproject/obs-studio/pull/11906
sha256 = "sha256-DIlAMCdve7wfbMV5YCd3qJnZ2xwJMmQD6LamGP7ECOA=";
fetchSubmodules = true;
};
version = "31.1.0-beta1";
patches =
builtins.filter (
patch:
!(
builtins.baseNameOf (toString patch) == "Enable-file-access-and-universal-access-for-file-URL.patch"
)
)
oldAttrs.patches;
});
plugins = with pkgs.obs-studio-plugins; [obs-pipewire-audio-capture]; plugins = with pkgs.obs-studio-plugins; [obs-pipewire-audio-capture];
enableVirtualCamera = true; enableVirtualCamera = true;
}; };

2
modules/desktop/packages.nix
View file

@ -19,7 +19,7 @@
wl-clipboard wl-clipboard
prismlauncher prismlauncher
authenticator authenticator
nexusmods-app-unfree # nexusmods-app-unfree
hunspellDicts.en_CA-large hunspellDicts.en_CA-large
]; ];
} }