authenticator: 4.0.3 -> 4.1.1

This commit is contained in:
Robert Schütz 2022-04-26 04:05:16 +00:00 committed by Yt
parent 4e6f7cd4a8
commit 948bf6d0cd

View File

@ -3,11 +3,11 @@
, fetchFromGitLab , fetchFromGitLab
, fetchpatch , fetchpatch
, appstream-glib , appstream-glib
, clang
, desktop-file-utils , desktop-file-utils
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, python3
, rustPlatform , rustPlatform
, wrapGAppsHook , wrapGAppsHook
, gdk-pixbuf , gdk-pixbuf
@ -15,7 +15,9 @@
, gst_all_1 , gst_all_1
, gtk4 , gtk4
, libadwaita , libadwaita
, libclang
, openssl , openssl
, pipewire
, sqlite , sqlite
, wayland , wayland
, zbar , zbar
@ -23,33 +25,29 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "authenticator"; pname = "authenticator";
version = "4.0.3"; version = "4.1.1";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "World"; owner = "World";
repo = "Authenticator"; repo = "Authenticator";
rev = version; rev = version;
sha256 = "0fvs76f3fm5pxn7wg6sjbqpgip5w2j7xrh4siasdcl2bx6vsld8b"; hash = "sha256-wl7wyj0vVDkOB7XKQFOEFzCmffTsrUsaM83fWgZ6tG0=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
name = "${pname}-${version}"; name = "${pname}-${version}";
sha256 = "1s97jyszxf24rs3ni11phiyvmp1wm8sicb0rh1jgwz4bn1cnakx4"; hash = "sha256-3SzemDjLsZUXPPtSlDMBQXQf5P3Sz8caJL73mHRv1js=";
}; };
postPatch = ''
patchShebangs build-aux
'';
nativeBuildInputs = [ nativeBuildInputs = [
appstream-glib appstream-glib
clang
desktop-file-utils desktop-file-utils
meson meson
ninja ninja
pkg-config pkg-config
python3
wrapGAppsHook wrapGAppsHook
] ++ (with rustPlatform; [ ] ++ (with rustPlatform; [
cargoSetupHook cargoSetupHook
@ -62,39 +60,23 @@ stdenv.mkDerivation rec {
glib glib
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gst-plugins-base 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; }) (gst_all_1.gst-plugins-bad.override { enableZbar = true; })
gtk4 gtk4
libadwaita libadwaita
openssl openssl
pipewire
sqlite sqlite
wayland wayland
zbar zbar
]; ];
meta = with lib; { LIBCLANG_PATH = "${lib.getLib libclang}/lib";
broken = true; # https://gitlab.gnome.org/World/Authenticator/-/issues/271
meta = {
description = "Two-factor authentication code generator for GNOME"; description = "Two-factor authentication code generator for GNOME";
homepage = "https://gitlab.gnome.org/World/Authenticator"; homepage = "https://gitlab.gnome.org/World/Authenticator";
license = licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
maintainers = with maintainers; [ dotlambda ]; maintainers = with lib.maintainers; [ dotlambda ];
platforms = lib.platforms.linux;
}; };
} }