diff --git a/flake.lock b/flake.lock index 69fcf48..fa139ba 100644 --- a/flake.lock +++ b/flake.lock @@ -695,11 +695,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1720768451, - "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fd1b24e..f515b9b 100644 --- a/flake.nix +++ b/flake.nix @@ -51,7 +51,7 @@ ... }: let - inherit (builtins) mapAttrs replaceStrings; + inherit (builtins) mapAttrs replaceStrings elem; inherit (lib) mapAttrs' filterAttrs nameValuePair recurseIntoAttrs evalModules; inherit (lib.flake) flattenTree eachDefaultSystem; inherit (lib.my) mkDefaultSystemsPkgs flakePackageOverlay; @@ -107,6 +107,16 @@ pkgsLibOverlay myPkgsOverlay ]; + + config = { + # RMS forgive me... + # Normally this is set modularly, but sometimes we need to use other pkgs + allowUnfreePredicate = p: elem (lib.getName p) [ + "widevine-cdm" + "chromium-unwrapped" + "chromium" + ]; + }; })) pkgsFlakes; diff --git a/home-manager/modules/gui/default.nix b/home-manager/modules/gui/default.nix index e520bd1..8fd5fa0 100644 --- a/home-manager/modules/gui/default.nix +++ b/home-manager/modules/gui/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, pkgs', pkgs, config, ... }: let inherit (lib) genAttrs mkIf mkMerge mkForce; inherit (lib.my) mkBoolOpt'; @@ -319,7 +319,7 @@ in chromium = { enable = true; - package = (pkgs.chromium.override { enableWideVine = true; }).overrideAttrs (old: { + package = (pkgs'.unstable.chromium.override { enableWideVine = true; }).overrideAttrs (old: { buildCommand = '' ${old.buildCommand}