From 640739b7e9a045f580fe30eb99fee45c32f2af4d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 22 Aug 2018 23:34:40 +0200
Subject: ...
---
hel.nix | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/hel.nix b/hel.nix
index e8da5361..0d8ffb73 100644
--- a/hel.nix
+++ b/hel.nix
@@ -127,24 +127,20 @@
configureFlags = [ "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ];
};
- # fprintd = pkgs.stdenv.mkDerivation rec {
- # name = "fprintd-${version}";
- # version = "0.8.1";
-
- # src = pkgs.fetchgit {
- # url = "https://gitlab.freedesktop.org/libfprint/fprintd";
- # rev = "refs/tags/V_0_8_1";
- # sha256 = "1b9za3vabwbwb9afn37whgkqm6kfz0m7vg6cqki1gsbsdk7vz868";
- # };
-
- # buildInputs = with pkgs; [ libfprint glib dbus-glib polkit nss pam systemd ];
- # nativeBuildInputs = with pkgs; [ pkgconfig intltool autoreconfHook gtk-doc ];
-
- # configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" ];
- # });
+ fprintd = pkgs.stdenv.mkDerivation rec {
+ name = "fprintd-${version}";
+ version = "0.8.1";
+
+ src = pkgs.fetchgit {
+ url = "https://gitlab.freedesktop.org/libfprint/fprintd";
+ rev = "refs/tags/V_0_8_1";
+ sha256 = "1b9za3vabwbwb9afn37whgkqm6kfz0m7vg6cqki1gsbsdk7vz868";
+ };
- fprintd = pkgs.stdenv.lib.overrideDerivation pkgs.fprintd (oldAttrs: {
- installFlags = oldAttrs.installFlags or [] ++ [ "sysconfdir=\${out}/etc" ];
+ buildInputs = with pkgs; [ libfprint glib dbus-glib polkit nss pam systemd ];
+ nativeBuildInputs = with pkgs; [ pkgconfig intltool autoreconfHook gtk-doc ];
+
+ configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" ];
});
};
--
cgit v1.2.3