diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2023-03-19 22:52:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-19 22:52:28 +0100 |
| commit | 60c1d71f2ba4c80178ec84523c2ca0801522e0a6 (patch) | |
| tree | 7b21ebeacf0043d021f76c7ebbec371a8c4c8682 | |
| parent | d8755c55b497d112082605560612741d700ac502 (diff) | |
| parent | 043b2de66ea73af325749c169033c63bd650fe34 (diff) | |
Merge pull request #217069 from austinbutler/authenticator-gtk4-override
| -rw-r--r-- | pkgs/applications/misc/authenticator/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
2 files changed, 18 insertions, 6 deletions
diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/applications/misc/authenticator/default.nix index 5fb336d8de371..5f6d1c419567f 100644 --- a/pkgs/applications/misc/authenticator/default.nix +++ b/pkgs/applications/misc/authenticator/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitLab , appstream-glib -, clang , desktop-file-utils , meson , ninja @@ -14,7 +13,6 @@ , gst_all_1 , gtk4 , libadwaita -, libclang , openssl , pipewire , sqlite @@ -24,20 +22,20 @@ stdenv.mkDerivation rec { pname = "authenticator"; - version = "4.1.6"; + version = "4.2.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Authenticator"; rev = version; - hash = "sha256-fv7Np3haRCJABlJocKuu+1jevHYrdo+VyiQBpRmHs2g="; + hash = "sha256-Nv4QE6gyh42Na/stAgTIapV8GQuUHCdL6IEO//J8dV8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-8GddlDM1lU365GXdrKNhO331/y1p3Om5uZfVLy8TBGI="; + hash = "sha256-IS9jdr19VvgX6M1OqM6rjE8veujZcwBuOTuDm5mDXso="; }; nativeBuildInputs = [ @@ -80,5 +78,8 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ austinbutler ]; platforms = lib.platforms.linux; + # Fails to build on aarch64 with error + # "a label can only be part of a statement and a declaration is not a statement" + broken = stdenv.isLinux && stdenv.isAarch64; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 661e8562143be..88129dc070b4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2811,7 +2811,18 @@ with pkgs; audiowaveform = callPackage ../tools/audio/audiowaveform { }; - authenticator = callPackage ../applications/misc/authenticator { }; + authenticator = callPackage ../applications/misc/authenticator rec { + # Remove when GTK is upgraded past 4.8 + # https://github.com/NixOS/nixpkgs/issues/216770 + gtk4 = pkgs.gtk4.overrideAttrs (_: rec { + version = "4.9.4"; + src = fetchurl { + url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; + sha256 = "sha256-kaOv1YQB1OXYHjCwjuPxE6R2j/EBQDNqcqMmx3JyvjA="; + }; + }); + wrapGAppsHook4 = wrapGAppsHook.override { gtk3 = gtk4; }; + }; autoflake = with python3.pkgs; toPythonApplication autoflake; |