summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2019-11-17 12:29:25 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2019-11-17 12:29:25 +0100
commit642ecd9bc007738aed77729e439ea8dd6f12e0df (patch)
tree9742497467ddcaf19784ef2131a53e8ef4808e85
parentd219fa4694ca7b33c7a71772f8f796d75e681e3f (diff)
downloadnixos-642ecd9bc007738aed77729e439ea8dd6f12e0df.tar
nixos-642ecd9bc007738aed77729e439ea8dd6f12e0df.tar.gz
nixos-642ecd9bc007738aed77729e439ea8dd6f12e0df.tar.bz2
nixos-642ecd9bc007738aed77729e439ea8dd6f12e0df.tar.xz
nixos-642ecd9bc007738aed77729e439ea8dd6f12e0df.zip
No need to override fprint on sif
-rw-r--r--sif.nix28
1 files changed, 0 insertions, 28 deletions
diff --git a/sif.nix b/sif.nix
index 21e52529..a3993584 100644
--- a/sif.nix
+++ b/sif.nix
@@ -55,34 +55,6 @@
55 git rebuild-system 55 git rebuild-system
56 ]; 56 ];
57 57
58 nixpkgs.config.packageOverrides = pkgs: rec {
59 libfprint = pkgs.stdenv.mkDerivation rec {
60 name = "libfprint-${version}";
61 version = "vfs0090-f8323a0";
62
63 src = pkgs.fetchFromGitHub {
64 owner = "3v1n0";
65 repo = "libfprint";
66 rev = "f8323a0d3e0616f2822547902306992efd3572e7";
67 sha256 = "0y0lkwgw1lx4frm1kxz0hj11x93dby7vxkjly0ck7w7z96nn8bnm";
68 };
69
70 buildInputs = with pkgs; [ libusb pixman glib nss nspr gdk_pixbuf openssl ];
71 nativeBuildInputs = with pkgs; [ pkgconfig libtool automake autoconf ];
72
73 preConfigure = ''
74 NOCONFIGURE=true ./autogen.sh
75 '';
76
77 configureFlags = [ "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ];
78 };
79
80 fprintd = pkgs.stdenv.lib.overrideDerivation pkgs.fprintd (oldAttrs: {
81 configureFlags = oldAttrs.configureFlags or [] ++ ["--sysconfdir=/etc" "--localstatedir=/var"];
82 installFlags = oldAttrs.installFlags or [] ++ ["sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}"];
83 });
84 };
85
86 nixpkgs.config.allowUnfree = true; 58 nixpkgs.config.allowUnfree = true;
87 59
88 services = { 60 services = {