Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1ac5e08d5de2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: db96124d3d5a
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Sep 18, 2019

  1. libfprint: 0.99 -> 1.0 

    https://gitlab.freedesktop.org/libfprint/libfprint/-/tags/V_1_0
    @worldofpeace
    worldofpeace committed Sep 18, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    tonistiigi Tõnis Tiigi
    GPG key ID: AFA9DE5F8AB7AF39
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7854b86 View commit details

  2. fprintd: 0.8.1 -> 0.9.0 

    Resolves issues with StateDirectory not being set in
systemd unit.

https://gitlab.freedesktop.org/libfprint/fprintd/-/tags/V_0_9_0
    @worldofpeace
    worldofpeace committed Sep 18, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    tonistiigi Tõnis Tiigi
    GPG key ID: AFA9DE5F8AB7AF39
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e264403 View commit details

Commits on Oct 1, 2019

  1. Merge pull request #68995 from worldofpeace/bump/libfprint 

    fprintd: 0.8.1 -> 0.9.0, libfprint: 0.99 -> 1.0
    @worldofpeace
    worldofpeace authored Oct 1, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    tonistiigi Tõnis Tiigi
    GPG key ID: AFA9DE5F8AB7AF39
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    db96124 View commit details
Showing with 79 additions and 30 deletions.
  1. +0 −7 nixos/modules/services/security/fprintd.nix
  2. +43 −10 pkgs/development/libraries/libfprint/default.nix
  3. +36 −13 pkgs/tools/security/fprintd/default.nix
7 changes: 0 additions & 7 deletions nixos/modules/services/security/fprintd.nix
View file
Original file line number Diff line number Diff line change
@@ -50,13 +50,6 @@ in

systemd.packages = [ cfg.package ];


# The upstream unit does not use StateDirectory, and will
# fail if the directory it needs is not present. Should be
# fixed when https://gitlab.freedesktop.org/libfprint/fprintd/merge_requests/5
# is merged.
systemd.services.fprintd.serviceConfig.StateDirectory = "fprint";

};

}
53 changes: 43 additions & 10 deletions pkgs/development/libraries/libfprint/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,27 @@
{ thinkpad ? false, stdenv, fetchFromGitHub, fetchurl, pkgconfig, meson, ninja, libusb, pixman, glib, nss, gtk3
, coreutils, gtk-doc, docbook_xsl, docbook_xml_dtd_43, openssl ? null }:
{ thinkpad ? false
, stdenv
, fetchFromGitHub
, fetchurl
, pkgconfig
, meson
, ninja
, libusb
, pixman
, glib
, nss
, gtk3
, coreutils
, gtk-doc
, docbook_xsl
, docbook_xml_dtd_43
, openssl ? null
}:

assert thinkpad -> openssl != null;

stdenv.mkDerivation rec {
pname = "libfprint" + stdenv.lib.optionalString thinkpad "-thinkpad";
version = "0.99.0";
version = "1.0";

src = {
libfprint-thinkpad =
@@ -16,19 +32,36 @@ stdenv.mkDerivation rec {
sha256 = "1vps1wrp7hskf13f7jrv0dwry2fcid76x2w463wplngp63cj7b3b";
};
libfprint = fetchurl {
url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/82ba3cef5bdf72997df711eacdb13c0f/libfprint-${version}.tar.xz";
sha256 = "16r4nl40y0jri57jiqmdz4s87byblx22lbhyvqpljd6mqm5rg187";
url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/aff93e9921d1cff53d7c070944952ff9/libfprint-${version}.tar.xz";
sha256 = "0v84pd12v016m8iimhq39fgzamlarqccsr7d98cvrrwrzrgcixrd";
};
}.${pname};

buildInputs = [ libusb pixman glib nss gtk3 ]
++ stdenv.lib.optional thinkpad openssl;
nativeBuildInputs = [
pkgconfig
meson
ninja
gtk-doc
docbook_xsl
docbook_xml_dtd_43
];

nativeBuildInputs = [ pkgconfig meson ninja gtk-doc docbook_xsl docbook_xml_dtd_43 ];
buildInputs = [
libusb
pixman
glib
nss
gtk3
]
++ stdenv.lib.optional thinkpad openssl
;

mesonFlags = [ "-Dudev_rules_dir=lib/udev/rules.d" "-Dx11-examples=false" ];
mesonFlags = [
"-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"
"-Dx11-examples=false"
];

preConfigure = ''
postPatch = ''
substituteInPlace libfprint/meson.build \
--replace /bin/echo ${coreutils}/bin/echo
'';
49 changes: 36 additions & 13 deletions pkgs/tools/security/fprintd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,49 @@
{ thinkpad ? false
, stdenv, fetchurl, pkgconfig, intltool, libfprint-thinkpad ? null
, libfprint ? null, glib, dbus-glib, polkit, nss, pam, systemd }:
, stdenv
, fetchurl
, pkgconfig
, intltool
, libfprint-thinkpad ? null
, libfprint ? null
, glib
, dbus-glib
, polkit
, nss
, pam
, systemd
}:

stdenv.mkDerivation rec {
pname = "fprintd" + stdenv.lib.optionalString thinkpad "-thinkpad";
version = "0.8.1";
version = "0.9.0";

src = fetchurl {
url = "https://gitlab.freedesktop.org/libfprint/fprintd/uploads/bdd9f91909f535368b7c21f72311704a/fprintd-${version}.tar.xz";
sha256 = "124s0g9syvglgsmqnavp2a8c0zcq8cyaph8p8iyvbla11vfizs9l";
url = "https://gitlab.freedesktop.org/libfprint/fprintd/uploads/9dec4b63d1f00e637070be1477ce63c0/fprintd-${version}.tar.xz";
sha256 = "182gcnwb6zjwmk0dn562rjmpbk7ac7dhipbfdhfic2sn1jzis49p";
};

buildInputs = [ glib dbus-glib polkit nss pam systemd ]
++ stdenv.lib.optional thinkpad libfprint-thinkpad
++ stdenv.lib.optional (!thinkpad) libfprint;
nativeBuildInputs = [
intltool
pkgconfig
];

nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [
glib
dbus-glib
polkit
nss
pam
systemd
]
++ stdenv.lib.optional thinkpad libfprint-thinkpad
++ stdenv.lib.optional (!thinkpad) libfprint
;

configureFlags = [
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
"--localstatedir=/var"
"--sysconfdir=${placeholder "out"}/etc"
configureFlags = [
# is hardcoded to /var/lib/fprint, this is for the StateDirectory install target
"--localstatedir=${placeholder "out"}/var"
"--sysconfdir=${placeholder "out"}/etc"
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
];

meta = with stdenv.lib; {