diff options
| author | lassulus <lass@xerxes.r> | 2019-09-06 15:33:04 +0200 |
|---|---|---|
| committer | lassulus <lass@xerxes.r> | 2019-09-06 15:33:04 +0200 |
| commit | c2773285ebf8165fd725065047df7a58da01fb42 (patch) | |
| tree | e1e067b768f334916d9d07b6cfa5c1a72b8067a4 /tv/2configs/hw | |
| parent | b06065549a31cf1713135e6547b04f69f351d7fb (diff) | |
| parent | e388d02623b98bad5db52b29ea1ef1f494fddae8 (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/2configs/hw')
| -rw-r--r-- | tv/2configs/hw/AO753.nix | 2 | ||||
| -rw-r--r-- | tv/2configs/hw/w110er.nix | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tv/2configs/hw/AO753.nix b/tv/2configs/hw/AO753.nix index 4df5e097a..d5b755cef 100644 --- a/tv/2configs/hw/AO753.nix +++ b/tv/2configs/hw/AO753.nix @@ -39,5 +39,5 @@ with import <stockholm/lib>; HandleSuspendKey=ignore ''; - krebs.nixpkgs.allowUnfreePredicate = pkg: hasPrefix "broadcom-sta-" pkg.name; + krebs.nixpkgs.allowUnfreePredicate = pkg: packageName pkg == "broadcom-sta"; } diff --git a/tv/2configs/hw/w110er.nix b/tv/2configs/hw/w110er.nix index 55e9482d4..7d837eabc 100644 --- a/tv/2configs/hw/w110er.nix +++ b/tv/2configs/hw/w110er.nix @@ -10,10 +10,11 @@ with import <stockholm/lib>; #hardware.bumblebee.enable = true; #hardware.bumblebee.group = "video"; #hardware.enableRedistributableFirmware= true; - #krebs.nixpkgs.allowUnfreePredicate = pkg: - # hasPrefix "nvidia-x11-" pkg.name || - # hasPrefix "nvidia-persistenced-" pkg.name || - # hasPrefix "nvidia-settings-" pkg.name; + #krebs.nixpkgs.allowUnfreePredicate = pkg: any (eq (packageName pkg)) [ + # "nvidia-x11" + # "nvidia-persistenced" + # "nvidia-settings" + #]; } ]; |