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] 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 f3b9cad0720..d6cffcab7fe 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";