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/default.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/default.nix')
-rw-r--r-- | users/glittershark/pkgs/fprintd/default.nix | 130 |
1 files changed, 0 insertions, 130 deletions
diff --git a/users/glittershark/pkgs/fprintd/default.nix b/users/glittershark/pkgs/fprintd/default.nix deleted file mode 100644 index 1a977e34d37e..000000000000 --- a/users/glittershark/pkgs/fprintd/default.nix +++ /dev/null @@ -1,130 +0,0 @@ -{ depot, pkgs, ... }: - -let - nixpkgs = import pkgs.path { - config.allowUnfree = true; - overlays = [(self: super: { - # TODO(grfn): Can we not override this here? It bootstraps - # rustc, builds firefox, and many other things. - gcc = super.gcc9; - })]; - }; - - inherit (nixpkgs) - stdenv - fetchFromGitLab - fetchpatch - pkgconfig - meson - ninja - perl - gettext - cairo - gtk-doc - libxslt - docbook-xsl-nons - docbook_xml_dtd_412 - glib - dbus - dbus-glib - polkit - nss - pam - systemd - python3; - libfprint-tod = nixpkgs.callPackage ./libfprint-tod.nix {}; - -in - -stdenv.mkDerivation rec { - pname = "fprintd"; - version = "1.90.1"; - outputs = [ "out" "devdoc" ]; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "libfprint"; - repo = pname; - rev = version; - sha256 = "0mbzk263x7f58i9cxhs44mrngs7zw5wkm62j5r6xlcidhmfn03cg"; - }; - - patches = [ - # Fixes issue with ":" when there is multiple paths (might be the case on NixOS) - # https://gitlab.freedesktop.org/libfprint/fprintd/-/merge_requests/50 - (fetchpatch { - url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/d7fec03f24d10f88d34581c72f0eef201f5eafac.patch"; - sha256 = "0f88dhizai8jz7hpm5lpki1fx4593zcy89iwi4brsqbqc7jp9ls0"; - }) - - # Fix locating libpam_wrapper for tests - (fetchpatch { - url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/merge_requests/40.patch"; - sha256 = "0qqy090p93lzabavwjxzxaqidkcb3ifacl0d3yh1q7ms2a58yyz3"; - }) - (fetchpatch { - url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f401f399a85dbeb2de165b9b9162eb552ab6eea7.patch"; - sha256 = "1bc9g6kc95imlcdpvp8qgqjsnsxg6nipr6817c1pz5i407yvw1iy"; - }) - ]; - - nativeBuildInputs = [ - pkgconfig - meson - ninja - perl - gettext - gtk-doc - libxslt - dbus - docbook-xsl-nons - docbook_xml_dtd_412 - ]; - - buildInputs = [ - glib - dbus-glib - polkit - nss - pam - systemd - libfprint-tod - ]; - - checkInputs = with python3.pkgs; [ - python-dbusmock - dbus-python - pygobject3 - pycairo - pypamtest - ]; - - mesonFlags = [ - "-Dgtk_doc=true" - "-Dpam_modules_dir=${placeholder "out"}/lib/security" - "-Dsysconfdir=${placeholder "out"}/etc" - "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/system-services" - "-Dsystemd_system_unit_dir=${placeholder "out"}/lib/systemd/system" - ]; - - PKG_CONFIG_DBUS_1_INTERFACES_DIR = "${placeholder "out"}/share/dbus-1/interfaces"; - PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; - PKG_CONFIG_DBUS_1_DATADIR = "${placeholder "out"}/share"; - - # FIXME: Ugly hack for tests to find libpam_wrapper.so - LIBRARY_PATH = stdenv.lib.makeLibraryPath [ python3.pkgs.pypamtest ]; - - doCheck = true; - - postPatch = '' - patchShebangs po/check-translations.sh - ''; - - meta = with stdenv.lib; { - homepage = "https://fprint.freedesktop.org/"; - description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar elyhaka ]; - }; -} |