From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 5877DAF43; Fri, 26 Jun 2026 18:55:36 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id B568DAF21; Fri, 26 Jun 2026 18:55:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail-106111.protonmail.ch (mail-106111.protonmail.ch [79.135.106.111]) by atuin.qyliss.net (Postfix) with ESMTPS id 2FEE3AF20 for ; Fri, 26 Jun 2026 18:55:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=colbyt.com; s=protonmail; t=1782500133; x=1782759333; bh=JohQFl1pqwzzqhxR5nsd7qdPqxyVUd0i1ptzPuHAQvU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:From:To: Cc:Date:Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=hpKH0/3eeiokxUNpSAO+q+MRm5OwbiFPXIX7jDrsks8YR6km3AxUs7ldX/oOAuGub RKKytRye2PJBd8Cd96ukCEvF6krji2jkRquJ4qtGaig1DlnUtUp+xvuhtLZp6ZwDXu FqMrFvWoq/UXc++J/kRwxkqQZlUP/5+MIuZx09w8T6HFVKIYxslBPQcgY7sdsYOoxI L0V+KFFNjWcuxCt9VAZwhhrl36WKwTVdAd5TXSR56QzGd+v6zUFoxX5GnC3o6gysf0 T67ZQwpWjgp8+bjpHqNt9vhiZmvlR1KCcgf1m9SHttx5B2ZvkyVcSOYFUPx42/4Ym7 i7V9jAyx5mSng== X-Pm-Submission-Id: 4gn4cg3XKrz2Sd3C From: colbyt To: devel@spectrum-os.org Subject: [PATCH 7/8] pkgs/libfyaml: fix pkg-config libs Date: Fri, 26 Jun 2026 11:55:07 -0700 Message-ID: <20260626185509.3715326-8-colby@colbyt.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260626185509.3715326-1-colby@colbyt.com> References: <20260626185509.3715326-1-colby@colbyt.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: I42QAPP274FEDMML4GK3NCORHB3X3S5K X-Message-ID-Hash: I42QAPP274FEDMML4GK3NCORHB3X3S5K X-MailFrom: colby@colbyt.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: colbyt X-Mailman-Version: 3.3.10 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The current nixpkgs libfyaml package can install a malformed Libs line containing the tokens "none required". AppStream consumes libfyaml.pc when building the Spectrum integration closure, and those stray tokens make the link step fail before the VM tests run. Normalize the generated pkg-config file in postInstall until the pinned nixpkgs package no longer needs the workaround. Signed-off-by: colbyt --- pkgs/overlay.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 66fea11..559e361 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -115,6 +115,13 @@ } )); + libfyaml = super.libfyaml.overrideAttrs ({ postInstall ? "", ... }: { + postInstall = postInstall + '' + sed -i 's/ -lpthread none required -lfyaml/ -lpthread -lfyaml/' \ + "$dev/lib/pkgconfig/libfyaml.pc" + ''; + }); + gtk3 = import ./gtk3 { inherit final super; }; mailutils = super.mailutils.overrideAttrs (_: ( -- 2.54.0