From patchwork Wed Oct 18 05:01:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grigory Shepelev X-Patchwork-Id: 54941 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 E926E27BBE9; Wed, 18 Oct 2023 06:02:50 +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.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,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 1B04927BBE2 for ; Wed, 18 Oct 2023 06:02:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qsyha-00069o-Qd; Wed, 18 Oct 2023 01:02:38 -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 1qsyhZ-00069I-Ay for guix-patches@gnu.org; Wed, 18 Oct 2023 01:02:37 -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 1qsyhZ-0003Mk-2p for guix-patches@gnu.org; Wed, 18 Oct 2023 01:02:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qsyhy-0002wj-HG for guix-patches@gnu.org; Wed, 18 Oct 2023 01:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66601] (@ (gnu packages wm) wlroots): expose "protocol" dir Resent-From: Grigory Shepelev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Oct 2023 05:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 66601@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169760537811312 (code B ref -1); Wed, 18 Oct 2023 05:03:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Oct 2023 05:02:58 +0000 Received: from localhost ([127.0.0.1]:33013 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qsyht-0002wO-Sb for submit@debbugs.gnu.org; Wed, 18 Oct 2023 01:02:58 -0400 Received: from lists.gnu.org ([2001:470:142::17]:38012) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qsyhq-0002w3-Kc for submit@debbugs.gnu.org; Wed, 18 Oct 2023 01:02:56 -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 1qsyhL-00065s-D7 for guix-patches@gnu.org; Wed, 18 Oct 2023 01:02:23 -0400 Received: from mail-lj1-x22a.google.com ([2a00:1450:4864:20::22a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qsyhJ-0003M4-LN for guix-patches@gnu.org; Wed, 18 Oct 2023 01:02:23 -0400 Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2c50305c5c4so77147701fa.1 for ; Tue, 17 Oct 2023 22:02:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697605339; x=1698210139; darn=gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=jETRcwXo9JQ7BGRKzhTIvOaPsuC+lbiL7J+cFR3yGPo=; b=gna/CRUgZwa/mpwyxaKkLnlB5PH4R48ausZXxYSw+1HzTyesxNWmW182c+zizhyNEI 68F7o8BF9Bfb7DjPhRxRuXKrL2c3kwezePfWTAxdZfqKvD/3DbTnyB1m78Qnnm7rZOQ1 OMW/zxWoh+jzAb3MmfluqAENDA9oBJG+PjAUc3Tqi2vsuge1rYpxLuGy/OR8vLkOqddu WaQlaiQ3UaQlyMtUm5dYs6/jIKoQPW9l54P50fFEUBGkY0VfoAcFtNRP9Z+8R9TYOSdP v8I68HTaJMhV8YL2cpYZOSsZncbV95HNZFvrJ7HRgzvD+SbfJcrBLtT2B6c/+eJHX+SK kLaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697605339; x=1698210139; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=jETRcwXo9JQ7BGRKzhTIvOaPsuC+lbiL7J+cFR3yGPo=; b=rkRNv8IHfj2ZRuURPGPV2xLgjnyittsSTPFTG+6iZoVt3c+55/vKdfL+Kz5c54lixk trEPVPN4Y0d5619Dh2jBeNBAXgmiYKn5IoHx776tDUWKKVcGrqLKDvFbJg+HmgSUXvOv 3ue/10sDp5uJLW07GjLbIRr2kDHOrCKlqnLA0CMmLX+lLFtLXF/QvrmNxxg2PgPwmGD5 CrHrBYdH3EjTRjgbb60/wuSjeYnU5GRexwpSW+Ti33OwEi6SJWsojcikLRDwzDqMnCLK 2ErsSe8lYBhxSshYaFNM1v2BNrcgdRRC4klrGQoi2yYY1lWCChP1tPKWXqY+dyByyliX iVeA== X-Gm-Message-State: AOJu0YzNvShZRkheO849vcUYqpaA4d/PYg5ajw77YRWjcKDmVBoiDREL UKyyGUclwg1BOdB7/o51rJmfHjJvjgHh70OhkqSp3ucR2l+LxA== X-Google-Smtp-Source: AGHT+IEyTGrzsblOCRhdqrVvT47pf7+BBmdyX7qfK2G4ByCnsR35lQ/9wxbEbbBfdIqQ5RJI3b/eshjBbrhkghaxsEk= X-Received: by 2002:a2e:8e75:0:b0:2c2:9872:dfc1 with SMTP id t21-20020a2e8e75000000b002c29872dfc1mr2643775ljk.42.1697605338701; Tue, 17 Oct 2023 22:02:18 -0700 (PDT) MIME-Version: 1.0 From: Grigory Shepelev Date: Wed, 18 Oct 2023 08:01:42 +0300 Message-ID: Received-SPF: pass client-ip=2a00:1450:4864:20::22a; envelope-from=shegeley@gmail.com; helo=mail-lj1-x22a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Hi I needed to tweak something in Sway and could not find its xml wayland protocol files. It was hidden in the package source. Exposed them to the build. diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 8576d0297d..45ef9cb073 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1648,7 +1648,15 @@ (define-public wlroots (substitute* "backend/drm/meson.build" (("/usr/share/hwdata/pnp.ids") (string-append (assoc-ref (or native-inputs inputs) "hwdata") - "/share/hwdata/pnp.ids")))))))) + "/share/hwdata/pnp.ids"))))) + (add-after 'install 'copy-protocols + (lambda* (#:key inputs outputs #:allow-other-keys) + (mkdir-p "protocols") + (copy-recursively + "protocol" ;; why singular?! + (string-append (assoc-ref outputs "out") + "/protocols")) + #t))))) (propagated-inputs (list ;; As required by wlroots.pc. eudev