diff options
Diffstat (limited to 'users/glittershark')
5 files changed, 11 insertions, 3 deletions
diff --git a/users/glittershark/pkgs/fprintd/default.nix b/users/glittershark/pkgs/fprintd/default.nix index 4c4632b7a3..0f9d414aeb 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 17a4af4505..d8e64f3cc1 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 70c5d6d367..d9c87e673c 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" ]; diff --git a/users/glittershark/system/home/modules/development.nix b/users/glittershark/system/home/modules/development.nix index cf7301cc60..c5338c8d9a 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 ae697592de..c695608977 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; |