diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-01-09T13·26+0300 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2021-01-13T16·53+0000 |
| commit | b4e420d4ff3011b8fd515c2cab33fbde55859b8f (patch) | |
| tree | 8abd2d9d8368c185c6422d0ba776f6a9d2744e37 /users/glittershark/system | |
| parent | 216e7334f6cc8b9a46a8ebc8be4e081f9580c840 (diff) | |
chore(3p): Bump NixOS channels to 2021-01-09 r/2078
Your regularly scheduled channel update, but slightly more regular than before. Included fixes: * 3p/emacs: Pick telega.el from stable channel, unstable is broken. * glittershark/fprintd: Compile with gcc9, since build fails with the new default of gcc10 * glittershark/fprintd: Use a global overlay for the fprintd package until https://github.com/NixOS/nixpkgs/pull/108962 lands in nixos-unstable * glittershark/home: Don't install rr, as it's not building with gcc10 Co-Author: Griffin Smith <grfn@gws.fyi> Change-Id: Ia715fef64a405a220049fc540017356fa7370e0b Reviewed-on: https://cl.tvl.fyi/c/depot/+/2341 Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: lukegb <lukegb@tvl.fyi> Tested-by: BuildkiteCI
Diffstat (limited to 'users/glittershark/system')
| -rw-r--r-- | users/glittershark/system/home/modules/development.nix | 1 | ||||
| -rw-r--r-- | users/glittershark/system/system/machines/yeren.nix | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/users/glittershark/system/home/modules/development.nix b/users/glittershark/system/home/modules/development.nix index cf7301cc60c2..c5338c8d9a84 100644 --- a/users/glittershark/system/home/modules/development.nix +++ b/users/glittershark/system/home/modules/development.nix @@ -63,7 +63,6 @@ with lib; config.lib.depot.third_party.clang-tools ] ++ optionals (stdenv.isLinux) [ valgrind - rr ]; programs.git = { diff --git a/users/glittershark/system/system/machines/yeren.nix b/users/glittershark/system/system/machines/yeren.nix index ae697592def2..c695608977be 100644 --- a/users/glittershark/system/system/machines/yeren.nix +++ b/users/glittershark/system/system/machines/yeren.nix @@ -70,6 +70,11 @@ intel-media-driver ]; + # the fprintd module hardcodes pkgs.fprintd :'( + nixpkgs.overlays = [(_: _: { + fprintd = config.depot.users.glittershark.pkgs.fprintd; + })]; + services.fprintd = { enable = true; package = config.depot.users.glittershark.pkgs.fprintd; |