From 16817d94f3381538e2ec8d7d39c3dd9c30aa0524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 28 May 2021 13:51:59 +0200 Subject: [PATCH 1/3] libadwaita: unstable-2021-05-01 -> 1.0.0-alpha.1 --- .../libraries/libadwaita/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index f3b9cad0720b..d6cffcab7fed 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -2,35 +2,40 @@ , stdenv , fetchFromGitLab , docbook-xsl-nons +, gi-docgen , gtk-doc +, libxml2 , meson , ninja , pkg-config , sassc , vala , gobject-introspection +, fribidi , gtk4 , xvfb-run }: stdenv.mkDerivation rec { pname = "libadwaita"; - version = "unstable-2021-05-01"; + version = "1.0.0-alpha.1"; outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; + outputBin = "devdoc"; # demo app src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "libadwaita"; - rev = "8d66b987a19979d9d7b85dacc6bad5ce0c8743fe"; - sha256 = "0i3wav6jsyi4w4i2r1rad769m5y5s9djj4zqb7dfyh0bad24ba3q"; + rev = version; + sha256 = "1v52md62kaqykv8b6kxxbxwnbdzlda4ir7n5wh2iizadcailyw7p"; }; nativeBuildInputs = [ docbook-xsl-nons + gi-docgen gtk-doc + libxml2 # for xmllint meson ninja pkg-config @@ -43,6 +48,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + fribidi gobject-introspection gtk4 ]; @@ -57,6 +63,10 @@ stdenv.mkDerivation rec { xvfb-run meson test ''; + postInstall = '' + mv $out/share/{doc,gtk-doc} + ''; + meta = with lib; { description = "Library to help with developing UI for mobile devices using GTK/GNOME"; homepage = "https://gitlab.gnome.org/GNOME/libadwaita"; From 575123a08a1b4783f3c22040a549adba54756201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 28 May 2021 15:50:03 +0200 Subject: [PATCH 2/3] mousai: fix with libadwaita 1.0.0-alpha.1 --- pkgs/applications/audio/mousai/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/applications/audio/mousai/default.nix index 687546624b0a..2f45a3fea92f 100644 --- a/pkgs/applications/audio/mousai/default.nix +++ b/pkgs/applications/audio/mousai/default.nix @@ -1,6 +1,7 @@ { lib , python3 , fetchFromGitHub +, fetchpatch , appstream-glib , desktop-file-utils , gettext @@ -29,6 +30,14 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-AfR5n1dIm9X5OoPiikQEhHBFQq0rmQH4h7cCJ2yXoXI="; }; + patches = [ + (fetchpatch { + name = "fix-ABI-breakage-from-libadwaita.patch"; + url = "https://github.com/SeaDve/Mousai/commit/e3db2d9d1949300f49399209b56d667746e539df.patch"; + sha256 = "078kvmyhw4jd1m2npai0yl00lwh47jys2n03pkgxp6jf873y83vs"; + }) + ]; + postPatch = '' patchShebangs build-aux/meson ''; From 4988b9bda18b0ba4373e15edb71d8538b39fd2c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Jun 2021 22:01:41 +0200 Subject: [PATCH 3/3] authenticator: mark as broken It's incompatible with the most recent version of libadwaita. --- pkgs/applications/misc/authenticator/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/applications/misc/authenticator/default.nix index 46b61720d0a3..ffa34d041e9c 100644 --- a/pkgs/applications/misc/authenticator/default.nix +++ b/pkgs/applications/misc/authenticator/default.nix @@ -91,6 +91,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + broken = true; # https://gitlab.gnome.org/World/Authenticator/-/issues/271 description = "Two-factor authentication code generator for GNOME"; homepage = "https://gitlab.gnome.org/World/Authenticator"; license = licenses.gpl3Plus;