From b4e420d4ff3011b8fd515c2cab33fbde55859b8f Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 9 Jan 2021 16:26:13 +0300 Subject: chore(3p): Bump NixOS channels to 2021-01-09 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 Change-Id: Ia715fef64a405a220049fc540017356fa7370e0b Reviewed-on: https://cl.tvl.fyi/c/depot/+/2341 Reviewed-by: tazjin Reviewed-by: glittershark Reviewed-by: lukegb Tested-by: BuildkiteCI --- users/glittershark/pkgs/fprintd/default.nix | 4 ++++ users/glittershark/pkgs/fprintd/libfprint-tod-clean.nix | 2 +- users/glittershark/pkgs/fprintd/libfprint-tod.nix | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'users/glittershark/pkgs') diff --git a/users/glittershark/pkgs/fprintd/default.nix b/users/glittershark/pkgs/fprintd/default.nix index 4c4632b7a32e..0f9d414aeb86 100644 --- a/users/glittershark/pkgs/fprintd/default.nix +++ b/users/glittershark/pkgs/fprintd/default.nix @@ -3,7 +3,11 @@ args @ { pkgs, ... }: let nixpkgs = import pkgs.nixpkgsSrc { config.allowUnfree = true; + overlays = [(self: super: { + gcc = super.gcc9; + })]; }; + inherit (nixpkgs) stdenv fetchFromGitLab diff --git a/users/glittershark/pkgs/fprintd/libfprint-tod-clean.nix b/users/glittershark/pkgs/fprintd/libfprint-tod-clean.nix index 17a4af450599..d8e64f3cc1c9 100644 --- a/users/glittershark/pkgs/fprintd/libfprint-tod-clean.nix +++ b/users/glittershark/pkgs/fprintd/libfprint-tod-clean.nix @@ -21,7 +21,7 @@ }: stdenv.mkDerivation rec { - pname = "libfprint"; + pname = "libfprint-tod-clean"; version = "1.90.2"; outputs = [ "out" "devdoc" ]; diff --git a/users/glittershark/pkgs/fprintd/libfprint-tod.nix b/users/glittershark/pkgs/fprintd/libfprint-tod.nix index 70c5d6d367c1..d9c87e673c97 100644 --- a/users/glittershark/pkgs/fprintd/libfprint-tod.nix +++ b/users/glittershark/pkgs/fprintd/libfprint-tod.nix @@ -22,7 +22,7 @@ }: stdenv.mkDerivation rec { - pname = "libfprint"; + pname = "libfprint-tod"; version = "1.90.2"; outputs = [ "out" "devdoc" ]; -- cgit 1.4.1