diff options
author | Vincent Ambo <mail@tazj.in> | 2021-04-07T12·34+0200 |
---|---|---|
committer | tazjin <mail@tazj.in> | 2021-04-11T22·13+0000 |
commit | 7deabb8c8d6f4c7e58e2b16548b8a1895795963b (patch) | |
tree | c7b55b5ec32d9c1e45ca3b4f33ef14d2cf82265f /users/glittershark/pkgs/fprintd/libfprint-tod.nix | |
parent | 9073ac18c48f2bcefc736839d6faf76a462bf433 (diff) |
chore(3p): Bump channels to 2021-04-09 r/2481
Fixes included: * exposed gtest in the package set, required for protobuf * pinned SBCL to version 2.0.8: The channel moved it to >2.1, and a bunch of warnings seemed to be killing our builds - we should investigate this later. * removed kernel patches from //users/tazjin/frog: this machine is currently out of service anyways, not worth fixing while it's offline * removed steam & lutris from frog (they're currently broken) * removed Haskell overrides for hedgehog-classes & hgeometry-combinatorial * use gRPC sources from upstream and inject Abseil via Nix instead * fix for renamed grpc import in //third_party/nix * use libfprint-tod from upstream nixpkgs in glittershark/yeren and delete glittershark/pkgs/fprintd entirely, since all of the patches used there are available and working from upstream now (and stopped working here after the bump) Change-Id: Ia90e6f774f7b88bc9e60d28351b900ca43ee2695 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2901 Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: lukegb <lukegb@tvl.fyi> Tested-by: BuildkiteCI
Diffstat (limited to 'users/glittershark/pkgs/fprintd/libfprint-tod.nix')
-rw-r--r-- | users/glittershark/pkgs/fprintd/libfprint-tod.nix | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/users/glittershark/pkgs/fprintd/libfprint-tod.nix b/users/glittershark/pkgs/fprintd/libfprint-tod.nix deleted file mode 100644 index d9c87e673c97..000000000000 --- a/users/glittershark/pkgs/fprintd/libfprint-tod.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ stdenv -, pkgs -, fetchFromGitLab -, fetchurl -, pkgconfig -, meson -, ninja -, libusb -, gusb -, pixman -, gobject-introspection -, glib -, nss -, gtk3 -, python3 -, umockdev -, coreutils -, gtk-doc -, docbook_xsl -, docbook_xml_dtd_43 -, libfprint-tod-goodix ? (pkgs.callPackage ./libfprint-tod-goodix.nix {}) -}: - -stdenv.mkDerivation rec { - pname = "libfprint-tod"; - version = "1.90.2"; - outputs = [ "out" "devdoc" ]; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "3v1n0"; - repo = "libfprint"; - rev = "0e123d0752538d834ee2cca8b471373369ad5e89"; - sha256 = "11yl3nikdyykamafqf3ys1wg7zx3rb81lf11ndd8sf9rkwwfgpn6"; - }; - - checkInputs = [ (python3.withPackages (ps: with ps; [ pycairo gobject ])) umockdev ]; - - nativeBuildInputs = [ - pkgconfig - meson - gobject-introspection - ninja - gtk-doc - docbook_xsl - docbook_xml_dtd_43 - ]; - - buildInputs = [ - libusb - gusb - pixman - glib - nss - gtk3 - libfprint-tod-goodix - ]; - - mesonFlags = [ - "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d" - "-Dx11-examples=false" - ]; - - doChecks = true; - - checkPhase = '' - meson test -C build --print-errorlogs - ''; - - postPatch = '' - substituteInPlace libfprint/meson.build \ - --replace /bin/echo ${coreutils}/bin/echo - ''; - - postInstall = '' - mkdir -p $out/lib/libfprint-2/tod-1/ - ln -s ${libfprint-tod-goodix}/usr/lib/libfprint-2/tod-1/libfprint-tod-goodix-53xc-0.0.6.so $out/lib/libfprint-2/tod-1/ - ln -s ${libfprint-tod-goodix}/lib/udev/rules.d/60-libfprint-2-tod1-goodix.rules $out/lib/udev/rules.d/ - - ''; - - meta = with stdenv.lib; { - homepage = https://fprint.freedesktop.org/; - description = "A library designed to make it easy to add support for consumer fingerprint readers"; - license = licenses.lgpl21; - platforms = platforms.linux; - maintainers = with maintainers; [ jobojeha ]; - }; -} |