summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2018-08-22 23:34:40 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2018-08-22 23:34:40 +0200
commit640739b7e9a045f580fe30eb99fee45c32f2af4d (patch)
treed9b68297b8ebc2d39177f7044c91bd7f1fcfc9a1
parentcf0f2cae941a3dcee033b38af80f442199bc1556 (diff)
downloadnixos-640739b7e9a045f580fe30eb99fee45c32f2af4d.tar
nixos-640739b7e9a045f580fe30eb99fee45c32f2af4d.tar.gz
nixos-640739b7e9a045f580fe30eb99fee45c32f2af4d.tar.bz2
nixos-640739b7e9a045f580fe30eb99fee45c32f2af4d.tar.xz
nixos-640739b7e9a045f580fe30eb99fee45c32f2af4d.zip
...
-rw-r--r--hel.nix30
1 files 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 @@
127 configureFlags = [ "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; 127 configureFlags = [ "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ];
128 }; 128 };
129 129
130 # fprintd = pkgs.stdenv.mkDerivation rec { 130 fprintd = pkgs.stdenv.mkDerivation rec {
131 # name = "fprintd-${version}"; 131 name = "fprintd-${version}";
132 # version = "0.8.1"; 132 version = "0.8.1";
133 133
134 # src = pkgs.fetchgit { 134 src = pkgs.fetchgit {
135 # url = "https://gitlab.freedesktop.org/libfprint/fprintd"; 135 url = "https://gitlab.freedesktop.org/libfprint/fprintd";
136 # rev = "refs/tags/V_0_8_1"; 136 rev = "refs/tags/V_0_8_1";
137 # sha256 = "1b9za3vabwbwb9afn37whgkqm6kfz0m7vg6cqki1gsbsdk7vz868"; 137 sha256 = "1b9za3vabwbwb9afn37whgkqm6kfz0m7vg6cqki1gsbsdk7vz868";
138 # }; 138 };
139
140 # buildInputs = with pkgs; [ libfprint glib dbus-glib polkit nss pam systemd ];
141 # nativeBuildInputs = with pkgs; [ pkgconfig intltool autoreconfHook gtk-doc ];
142
143 # configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" ];
144 # });
145 139
146 fprintd = pkgs.stdenv.lib.overrideDerivation pkgs.fprintd (oldAttrs: { 140 buildInputs = with pkgs; [ libfprint glib dbus-glib polkit nss pam systemd ];
147 installFlags = oldAttrs.installFlags or [] ++ [ "sysconfdir=\${out}/etc" ]; 141 nativeBuildInputs = with pkgs; [ pkgconfig intltool autoreconfHook gtk-doc ];
142
143 configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" ];
148 }); 144 });
149 }; 145 };
150 146