diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-04-07T12·34+0200 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2021-04-11T22·13+0000 |
| commit | 7deabb8c8d6f4c7e58e2b16548b8a1895795963b (patch) | |
| tree | c7b55b5ec32d9c1e45ca3b4f33ef14d2cf82265f /users/glittershark/system | |
| parent | 9073ac18c48f2bcefc736839d6faf76a462bf433 (diff) | |
chore(3p): Bump channels to 2021-04-09 r/2481
Fixes included: * exposed gtest in the package set, required for protobuf * pinned SBCL to version 2.0.8: The channel moved it to >2.1, and a bunch of warnings seemed to be killing our builds - we should investigate this later. * removed kernel patches from //users/tazjin/frog: this machine is currently out of service anyways, not worth fixing while it's offline * removed steam & lutris from frog (they're currently broken) * removed Haskell overrides for hedgehog-classes & hgeometry-combinatorial * use gRPC sources from upstream and inject Abseil via Nix instead * fix for renamed grpc import in //third_party/nix * use libfprint-tod from upstream nixpkgs in glittershark/yeren and delete glittershark/pkgs/fprintd entirely, since all of the patches used there are available and working from upstream now (and stopped working here after the bump) Change-Id: Ia90e6f774f7b88bc9e60d28351b900ca43ee2695 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2901 Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: lukegb <lukegb@tvl.fyi> Tested-by: BuildkiteCI
Diffstat (limited to 'users/glittershark/system')
| -rw-r--r-- | users/glittershark/system/system/machines/yeren.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/users/glittershark/system/system/machines/yeren.nix b/users/glittershark/system/system/machines/yeren.nix index 444ea91e84b7..7bb06716f79a 100644 --- a/users/glittershark/system/system/machines/yeren.nix +++ b/users/glittershark/system/system/machines/yeren.nix @@ -85,16 +85,14 @@ intel-media-driver ]; - # the fprintd module hardcodes pkgs.fprintd :'( - nixpkgs.overlays = [(_: _: { - fprintd = depot.users.glittershark.pkgs.fprintd; - })]; - services.fprintd = { enable = true; - package = depot.users.glittershark.pkgs.fprintd; + package = pkgs.fprintd-tod; }; + systemd.services.fprintd.environment.FP_TOD_DRIVERS_DIR = + "${pkgs.libfprint-2-tod1-goodix}/usr/lib/libfprint-2/tod-1"; + security.pam.loginLimits = [ { domain = "grfn"; |