diff options
author | Robert Schütz <nix@dotlambda.de> | 2022-04-26 04:05:16 +0000 |
---|---|---|
committer | Yt <raphael@megzari.com> | 2022-05-13 22:09:30 -0400 |
commit | 948bf6d0cdd4396ebd7294b932dc00c0ea30164d (patch) | |
tree | afdfb5963e754d5d167eac5ac1bb22e1869ecbf7 /pkgs/applications/misc/authenticator/default.nix | |
parent | 4e6f7cd4a862453abf2478561157abc84bbffd2b (diff) |
authenticator: 4.0.3 -> 4.1.1
Diffstat (limited to 'pkgs/applications/misc/authenticator/default.nix')
-rw-r--r-- | pkgs/applications/misc/authenticator/default.nix | 46 |
1 files changed, 14 insertions, 32 deletions
diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/applications/misc/authenticator/default.nix index ffa34d041e9c..e100c8807397 100644 --- a/pkgs/applications/misc/authenticator/default.nix +++ b/pkgs/applications/misc/authenticator/default.nix @@ -3,11 +3,11 @@ , fetchFromGitLab , fetchpatch , appstream-glib +, clang , desktop-file-utils , meson , ninja , pkg-config -, python3 , rustPlatform , wrapGAppsHook , gdk-pixbuf @@ -15,7 +15,9 @@ , gst_all_1 , gtk4 , libadwaita +, libclang , openssl +, pipewire , sqlite , wayland , zbar @@ -23,33 +25,29 @@ stdenv.mkDerivation rec { pname = "authenticator"; - version = "4.0.3"; + version = "4.1.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Authenticator"; rev = version; - sha256 = "0fvs76f3fm5pxn7wg6sjbqpgip5w2j7xrh4siasdcl2bx6vsld8b"; + hash = "sha256-wl7wyj0vVDkOB7XKQFOEFzCmffTsrUsaM83fWgZ6tG0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1s97jyszxf24rs3ni11phiyvmp1wm8sicb0rh1jgwz4bn1cnakx4"; + hash = "sha256-3SzemDjLsZUXPPtSlDMBQXQf5P3Sz8caJL73mHRv1js="; }; - postPatch = '' - patchShebangs build-aux - ''; - nativeBuildInputs = [ appstream-glib + clang desktop-file-utils meson ninja pkg-config - python3 wrapGAppsHook ] ++ (with rustPlatform; [ cargoSetupHook @@ -62,39 +60,23 @@ stdenv.mkDerivation rec { glib gst_all_1.gstreamer gst_all_1.gst-plugins-base - - # gst-plugins-good needs gtk4 support: - # https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/767 - # We copy the way it is built from the Flatpak: - # https://gitlab.gnome.org/World/Authenticator/-/blob/master/build-aux/com.belmoussaoui.Authenticator.Devel.json - (gst_all_1.gst-plugins-good.overrideAttrs (old: { - patches = old.patches or [ ] ++ [ - "${src}/build-aux/767.patch" - ]; - mesonFlags = old.mesonFlags ++ [ - "-Dgtk3=disabled" - "-Dgtk4=enabled" - "-Dgtk4-experiments=true" - ]; - buildInputs = old.buildInputs ++ [ - gtk4 - ]; - })) - (gst_all_1.gst-plugins-bad.override { enableZbar = true; }) gtk4 libadwaita openssl + pipewire sqlite wayland zbar ]; - meta = with lib; { - broken = true; # https://gitlab.gnome.org/World/Authenticator/-/issues/271 + LIBCLANG_PATH = "${lib.getLib libclang}/lib"; + + meta = { description = "Two-factor authentication code generator for GNOME"; homepage = "https://gitlab.gnome.org/World/Authenticator"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + platforms = lib.platforms.linux; }; } |