diff --git a/pkgs/by-name/au/authenticator/package.nix b/pkgs/by-name/au/authenticator/package.nix index 93612f60099d..53946da43883 100644 --- a/pkgs/by-name/au/authenticator/package.nix +++ b/pkgs/by-name/au/authenticator/package.nix @@ -1,55 +1,48 @@ -{ lib -, stdenv -, fetchFromGitLab -, appstream-glib -, cargo -, desktop-file-utils -, meson -, ninja -, pkg-config -, rustPlatform -, rustc -, wrapGAppsHook4 -, gdk-pixbuf -, glib -, gst_all_1 -, gtk4 -, libadwaita -, openssl -, pipewire -, sqlite -, wayland -, zbar -, glycin-loaders -, nix-update-script +{ + lib, + stdenv, + fetchFromGitLab, + appstream-glib, + cargo, + desktop-file-utils, + meson, + ninja, + pkg-config, + rustPlatform, + rustc, + wrapGAppsHook4, + gdk-pixbuf, + glib, + gst_all_1, + gtk4, + libadwaita, + openssl, + pipewire, + sqlite, + wayland, + zbar, + glycin-loaders, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "authenticator"; - version = "4.6.0"; + version = "4.6.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Authenticator"; - rev = version; - hash = "sha256-Kq/J/1+ROibR6NjfH/g760/CT4DZg1hIcsXQ4MHzrDc="; + tag = finalAttrs.version; + hash = "sha256-UvHIVUed4rxmjliaZ7jnwCjiHyvUDihoJyG3G+fYtow="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-SQDr4jdCZzuizYWwJ5crrunqN8O2bCUv5gIslBduAZY="; + inherit (finalAttrs) pname version src; + hash = "sha256-iOIGm3egVtVM6Eb3W5/ys9nQV5so0dnv2ZODjQwrVyw="; }; - preFixup = '' - gappsWrapperArgs+=( - # vp8enc preset - --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets" - # See https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44 - --prefix XDG_DATA_DIRS : "${glycin-loaders}/share" - ) - ''; + strictDeps = true; nativeBuildInputs = [ appstream-glib @@ -81,6 +74,15 @@ stdenv.mkDerivation rec { zbar ]; + preFixup = '' + gappsWrapperArgs+=( + # vp8enc preset + --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets" + # See https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44 + --prefix XDG_DATA_DIRS : "${glycin-loaders}/share" + ) + ''; + passthru = { updateScript = nix-update-script { }; }; @@ -93,4 +95,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ austinbutler ] ++ lib.teams.gnome-circle.members; platforms = lib.platforms.linux; }; -} +})