From patchwork Sat Sep 23 14:20:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54213 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B85E727BBE9; Sat, 23 Sep 2023 16:32:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AD9EA27BBE2 for ; Sat, 23 Sep 2023 16:32:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qk4br-0003ut-07; Sat, 23 Sep 2023 11:31:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qk4bo-0003s5-9L for guix-patches@gnu.org; Sat, 23 Sep 2023 11:31:52 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qk4bo-0000mU-12 for guix-patches@gnu.org; Sat, 23 Sep 2023 11:31:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qk4by-0004Da-UO for guix-patches@gnu.org; Sat, 23 Sep 2023 11:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 37/62] gnu: libxkbcommon: Add doc output. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Sep 2023 15:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65479@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169548311616166 (code B ref 65479); Sat, 23 Sep 2023 15:32:02 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Sep 2023 15:31:56 +0000 Received: from localhost ([127.0.0.1]:40335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk4bs-0004Cg-Ef for submit@debbugs.gnu.org; Sat, 23 Sep 2023 11:31:56 -0400 Received: from smtpm4.myservices.hosting ([185.26.105.235]:42756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk4bq-0004CX-HM for 65479@debbugs.gnu.org; Sat, 23 Sep 2023 11:31:55 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm4.myservices.hosting (Postfix) with ESMTP id 1423B20458 for <65479@debbugs.gnu.org>; Sat, 23 Sep 2023 17:31:41 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 7036B8009A; Sat, 23 Sep 2023 17:31:41 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id IlwRh-eE8Z7a; Sat, 23 Sep 2023 17:31:41 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id D2E9980095; Sat, 23 Sep 2023 17:31:40 +0200 (CEST) From: Bruno Victal Date: Sat, 23 Sep 2023 15:20:12 +0100 Message-ID: <7a5fbc028dfce58f0aefb15428bfb1fd4ebc9085.1695478390.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/xdisorg.scm (libxkbcommon)[arguments]: Restyle. <#:phases>: Add 'split-outputs. [outputs]: Add doc. --- gnu/packages/xdisorg.scm | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index ee6e00f518..adc8260943 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -531,13 +531,23 @@ (define-public libxkbcommon ;; wayland-scanner is required at build time. wayland)) (arguments - (list #:configure-flags - #~(list (string-append "-Dxkb-config-root=" - (search-input-directory - %build-inputs "share/X11/xkb")) - (string-append "-Dx-locale-root=" - (search-input-directory - %build-inputs "share/X11/locale"))))) + (list + #:configure-flags + #~(list (string-append "-Dxkb-config-root=" + (search-input-directory + %build-inputs "share/X11/xkb")) + (string-append "-Dx-locale-root=" + (search-input-directory + %build-inputs "share/X11/locale"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'split-outputs + (lambda _ + (let ((old (string-append #$output "/share/doc")) + (new (string-append #$output:doc "/share/doc"))) + (mkdir-p (dirname new)) + (rename-file old new))))))) + (outputs '("out" "doc")) (home-page "https://xkbcommon.org/") (synopsis "Library to handle keyboard descriptions") (description "Xkbcommon is a library to handle keyboard descriptions,