diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-17 20:01:59 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-17 20:01:59 -0400 |
| commit | 7854b86d46d6e9cbb701c0d256c42fcd18a16e1b (patch) | |
| tree | dd5a62e43d00ea4f0924b6ab54b06c7af50f5b40 /pkgs/development/libraries/libfprint | |
| parent | 446dd2543d8be0d53c30166133dd964a5340e214 (diff) | |
| download | nixpkgs-7854b86d46d6e9cbb701c0d256c42fcd18a16e1b.tar nixpkgs-7854b86d46d6e9cbb701c0d256c42fcd18a16e1b.tar.gz nixpkgs-7854b86d46d6e9cbb701c0d256c42fcd18a16e1b.tar.bz2 nixpkgs-7854b86d46d6e9cbb701c0d256c42fcd18a16e1b.tar.lz nixpkgs-7854b86d46d6e9cbb701c0d256c42fcd18a16e1b.tar.xz nixpkgs-7854b86d46d6e9cbb701c0d256c42fcd18a16e1b.tar.zst nixpkgs-7854b86d46d6e9cbb701c0d256c42fcd18a16e1b.zip | |
libfprint: 0.99 -> 1.0
https://gitlab.freedesktop.org/libfprint/libfprint/-/tags/V_1_0
Diffstat (limited to 'pkgs/development/libraries/libfprint')
| -rw-r--r-- | pkgs/development/libraries/libfprint/default.nix | 53 |
1 files changed, 43 insertions, 10 deletions
diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 410496a7bb7..9a6db72ae05 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -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 ''; |