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 E309A11356; Thu, 27 Nov 2025 16:41:54 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 965FE1131E; Thu, 27 Nov 2025 16:41:50 +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_MISSING,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from fhigh-b8-smtp.messagingengine.com (fhigh-b8-smtp.messagingengine.com [202.12.124.159]) by atuin.qyliss.net (Postfix) with ESMTPS id 849AC11295 for ; Thu, 27 Nov 2025 16:41:49 +0000 (UTC) Received: from phl-compute-06.internal (phl-compute-06.internal [10.202.2.46]) by mailfhigh.stl.internal (Postfix) with ESMTP id 4B99B7A020D; Thu, 27 Nov 2025 11:41:47 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-06.internal (MEProxy); Thu, 27 Nov 2025 11:41:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1764261707; x= 1764348107; bh=QNeC0Pk99bM4j8f8oiU3TVN3HGULzeytWk/eEAqk6H8=; b=R T6IwEpAguwrdmOdaioXemf6wrSEsa0bbBmZYTyQOVodAMotkrBY7WeQAcydkOzjG psxPzdbB2y2yaiYuh/5sczsT9gizGLnbTZmfkX7lLOzm+28bIrzP3fITngQbbsir oXVv63Gus0x/QFarF547+GN4wVweTWG854O/jxaWlu0xRuTIvQU+U4RxiAw6fEFG cZeSs+xcZ5KoOEm3N1xPGxb3Ivofl1xybzIS4hD65VgvEtsygkpjCaCd47RJjIBB 9ntkaw96FFTRK3lOL3DcGbsQR3DMtqRQySfZqUYmnZwRHDj3gGu4tXCcRLxZLOYF 7gXshjGQTnBO9bhyTaOfQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; t=1764261707; x=1764348107; bh=Q NeC0Pk99bM4j8f8oiU3TVN3HGULzeytWk/eEAqk6H8=; b=lFlIRapLv+nFhGxun s1U44CTkpyDDCahEiRs5OZtq4wyNMSPsxT5XpNrVTYFUPO9SgvmNxs96VsKV65t8 miaGUKFw6LWcAh5tZZBrnP3gf9u60I275LK0MneMgy53Af49Mx4c5Pei1mcCpQCD Ol9onQWZM+o3xOWGimsLhp4SNO5FyW90OgRrozViJAQa5/W5UT0YlU1jpMg7MHXe RHB1y8Iqpwi8wWUKnvpj/eC3hG+D/fjadny24vxo8/UDXXLB7w+4AYB1N3928I2C btGnfRpsQqamA8khcG2QoGEQTqLy4zyce0l3zk1h8H4n4pHlBfGnQangCfviQEvB Fja3w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggddvgeejjeegucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptehlhihsshgr ucftohhsshcuoehhihesrghlhihsshgrrdhisheqnecuggftrfgrthhtvghrnhepudeivd efleehkeegueejfeekleeggeeuieekffdtgeehkefhgeeitdegffevtefgnecuffhomhgr ihhnpehvuhiguhdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehhihesrghlhihsshgrrdhishdpnhgspghrtghpthhtohepvddpmhho uggvpehsmhhtphhouhhtpdhrtghpthhtohephihurhgvkhgrsegthigsvghrtghhrghosh druggvvhdprhgtphhtthhopeguvghvvghlsehsphgvtghtrhhumhdqohhsrdhorhhg X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 27 Nov 2025 11:41:46 -0500 (EST) Received: by fw12.qyliss.net (Postfix, from userid 1000) id 0EF7D2A7EE43; Thu, 27 Nov 2025 17:41:31 +0100 (CET) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH 3/3] host/rootfs: stop using pkgsStatic Date: Thu, 27 Nov 2025 17:41:19 +0100 Message-ID: <20251127164119.2037885-3-hi@alyssa.is> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251127164119.2037885-1-hi@alyssa.is> References: <20251127164119.2037885-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 4RCCUJOOFSQJR3KMYB44B62D5YR6PJL5 X-Message-ID-Hash: 4RCCUJOOFSQJR3KMYB44B62D5YR6PJL5 X-MailFrom: hi@alyssa.is X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; 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; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Yureka Lilian X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: For as long as we're running mesa on the host, we'll need dynamic linking, so let's at least stick to a single package set. Since we're longer cross compiling, I've switched to taking inkscape and xorg from the default package set. They're only used for building, not installed in the image, so let's avoid having to build their large musl closures. Signed-off-by: Alyssa Ross --- host/rootfs/default.nix | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix index 2af6cbe..50e03a3 100644 --- a/host/rootfs/default.nix +++ b/host/rootfs/default.nix @@ -4,15 +4,17 @@ import ../../lib/call-package.nix ( { callSpectrumPackage, spectrum-build-tools, src -, pkgsMusl, pkgsStatic, linux_latest +, pkgsMusl, linux_latest, inkscape, xorg }: -pkgsStatic.callPackage ( +pkgsMusl.callPackage ( { spectrum-host-tools , lib, stdenvNoCC, nixos, runCommand, writeClosure, erofs-utils, s6-rc -, busybox, cloud-hypervisor, cryptsetup, dbus, execline, inkscape -, iproute2, inotify-tools, jq, mdevd, s6, s6-linux-init, socat -, util-linuxMinimal, virtiofsd, xorg, xdg-desktop-portal-spectrum-host +, busybox, cloud-hypervisor, cosmic-files, crosvm, cryptsetup +, dejavu_fonts, dbus, execline, foot, fuse3, iproute2, inotify-tools +, jq, kmod, mdevd, mesa, s6, s6-linux-init, socat, systemd +, util-linuxMinimal, virtiofsd, westonLite, xdg-desktop-portal +, xdg-desktop-portal-gtk, xdg-desktop-portal-spectrum-host }: let @@ -21,20 +23,19 @@ let concatMapStringsSep concatStrings escapeShellArgs fileset mapAttrsToList trivial; - foot = pkgsMusl.foot.override { allowPgo = false; }; - packages = [ - cloud-hypervisor cryptsetup dbus execline inotify-tools iproute2 - jq mdevd s6 s6-linux-init s6-rc socat spectrum-host-tools - util-linuxMinimal virtiofsd xdg-desktop-portal-spectrum-host + cloud-hypervisor cosmic-files crosvm cryptsetup dbus execline + fuse3 inotify-tools iproute2 jq kmod mdevd s6 s6-linux-init s6-rc + socat spectrum-host-tools systemd util-linuxMinimal virtiofsd + xdg-desktop-portal-spectrum-host + + (foot.override { allowPgo = false; }) (busybox.override { # Use a separate file as it is a bit too big. extraConfig = builtins.readFile ./busybox-config; }) - - # Take kmod from pkgsMusl since we use pkgsMusl.kmod.lib below anyway. - ] ++ (with pkgsMusl; [ cosmic-files crosvm foot fuse3 kmod systemd ]); + ]; nixosAllHardware = nixos ({ modulesPath, ... }: { imports = [ (modulesPath + "/profiles/all-hardware.nix") ]; @@ -54,8 +55,9 @@ let # It doesn't get picked up from libsystemd-shared.so's RUNPATH due to # https://inbox.vuxu.org/musl/20251017-dlopen-use-rpath-of-caller-dso-v1-1-46c69eda1473@iscas.ac.cn/ usrPackages = [ - appvm kernel.modules firmware netvm - ] ++ (with pkgsMusl; [ dejavu_fonts kmod.lib mesa westonLite ]); + appvm dejavu_fonts kmod.lib mesa westonLite kernel.modules + firmware netvm + ]; appvms = { appvm-firefox = callSpectrumPackage ../../vm/app/firefox.nix {}; @@ -79,16 +81,16 @@ let # Weston doesn't support SVG icons. inkscape -w 20 -h 20 \ -o $out/usr/share/icons/hicolor/20x20/apps/com.system76.CosmicFiles.png \ - ${pkgsMusl.cosmic-files}/share/icons/hicolor/24x24/apps/com.system76.CosmicFiles.svg + ${cosmic-files}/share/icons/hicolor/24x24/apps/com.system76.CosmicFiles.svg ln -st $out/usr/bin \ ${concatMapStringsSep " " (p: "${p}/bin/*") packages} \ - ${pkgsMusl.xdg-desktop-portal}/libexec/xdg-document-portal \ - ${pkgsMusl.xdg-desktop-portal-gtk}/libexec/xdg-desktop-portal-gtk + ${xdg-desktop-portal}/libexec/xdg-document-portal \ + ${xdg-desktop-portal-gtk}/libexec/xdg-desktop-portal-gtk ln -st $out/usr/share/dbus-1 \ ${dbus}/share/dbus-1/session.conf ln -st $out/usr/share/dbus-1/services \ - ${pkgsMusl.xdg-desktop-portal-gtk}/share/dbus-1/services/org.freedesktop.impl.portal.desktop.gtk.service + ${xdg-desktop-portal-gtk}/share/dbus-1/services/org.freedesktop.impl.portal.desktop.gtk.service ${concatStrings (mapAttrsToList (name: path: '' ln -s ${path} $out/usr/lib/spectrum/vm/${name} -- 2.51.0