From 2a172dcba992f4c19c0cdafafc12cd1e559a3b93 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 29 Jul 2022 20:51:36 +0200 Subject: [PATCH] libadwaita: Fix API docs Also clean up remnants of gtk-doc from before gi-docgen migration. --- pkgs/development/libraries/libadwaita/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 54bf20601560..f36c88593155 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -1,10 +1,7 @@ { lib , stdenv , fetchFromGitLab -, docbook-xsl-nons , gi-docgen -, gtk-doc -, libxml2 , meson , ninja , pkg-config @@ -37,10 +34,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - docbook-xsl-nons gi-docgen - gtk-doc - libxml2 # for xmllint meson ninja pkg-config @@ -99,8 +93,9 @@ stdenv.mkDerivation rec { runHook postCheck ''; - postInstall = '' - mv $out/share/{doc,gtk-doc} + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" ''; passthru = {