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 9D22B56BAE; Fri, 21 Jul 2023 18:00:45 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 2CF1456B26; Fri, 21 Jul 2023 18:00:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by atuin.qyliss.net (Postfix) with ESMTPS id 631B456B1E for ; Fri, 21 Jul 2023 18:00:39 +0000 (UTC) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id 9D0273200988 for ; Fri, 21 Jul 2023 14:00:37 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Fri, 21 Jul 2023 14:00:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1689962437; x= 1690048837; bh=RWt098nzOey/wcn+yr+Tc0ENLYcrRkpi51lmQBOKg04=; b=t PzRi1KZgiO4u8e9j0GI2symMesPwqzIZg4CzKFEG3MMvhYKo8DWYWOTbPp9EyLJA 8k3xeQVjt9XhpVa3KWr+H4qJLay//+niLvVXUGr7pBN5cRbIZAbKVk63qTQRWj0w zycCfVvSTSYqun0vvW74ZrtCda7zT21xdrtG/eHRf0dMJZXe5luApz3bk6+U3/xj RlbdobaiPynORSNj1UdtooeikQ1NE64Obvw2xN6a1OrYwHsL+0OS0EhmzOgcUsHR MJq4RI4VDtsiR4/+y38NAEUcGYtX03FnvNhqwdYaYIJ+d2zgsXkndg5LpCeLTfmR 2t0FSzlh1E81x3U+t/clg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=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:sender :subject:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1689962437; x=1690048837; bh=R Wt098nzOey/wcn+yr+Tc0ENLYcrRkpi51lmQBOKg04=; b=mXh5yvR/aFVlbtgu/ iS66FHRlwtmjGitAgJjb0Oj2Q0+cHtyReRPemZdv+jVTzSBhNto+G/Yg/qcTltQy X7KuX+AAB9xLwsEHFQsrPg8yYcmgAPElgfb2FzcYp36gFJPwuF89ZxelNYcK89e1 CYD30aJ/98ByVx2ZiWt+b3DHKhEm3sAOyAkdWZTkcqIJTdWwHDCRzJKNRdHRT+2t ULLOaxZAqm3BlUexjPILyDncL8MHuRUMkmvoQ+ke09jPrA9Hzsn/fvkyYEn/RGhG W4Lk82bwRE5oXgGOq950S7CaU5ZBCcWCGEosOntvRho3cSPR9jp0wmrpU1LeDG58 QRWLg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrhedvgdduudegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhi sheqnecuggftrfgrthhtvghrnhepgfefudekvdelieelledufeevheeglefggedvudejvd dtffeuueevffehleejkedvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehm rghilhhfrhhomhephhhisegrlhihshhsrgdrihhs X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 21 Jul 2023 14:00:36 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 7C58E7329; Fri, 21 Jul 2023 18:00:35 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH v3 2/6] vm-lib: add mesa drivers to VM Date: Fri, 21 Jul 2023 18:00:13 +0000 Message-Id: <20230721180015.597099-3-hi@alyssa.is> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230721180015.597099-1-hi@alyssa.is> References: <20230721180015.597099-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: QBHUDZWSWZVFYWEYHHS4CQEDU5JBJYDP X-Message-ID-Hash: QBHUDZWSWZVFYWEYHHS4CQEDU5JBJYDP 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 X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Alyssa Ross Signed-off-by: Alyssa Ross Signed-off-by: Alyssa Ross --- vm-lib/make-vm.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vm-lib/make-vm.nix b/vm-lib/make-vm.nix index 85a0ce6..80e6ef5 100644 --- a/vm-lib/make-vm.nix +++ b/vm-lib/make-vm.nix @@ -33,7 +33,8 @@ runCommand "spectrum-vm" { mkdir -p "$out"/{blk,providers,shared-dirs} ${../scripts/make-erofs.sh} -L ext -- "$out/blk/run.img" ${run} run \ - $(comm -23 <(sort ${writeReferencesToFile run}) \ + ${pkgs.pkgsMusl.mesa.drivers} / \ + $(comm -23 <(sort ${writeReferencesToFile run} ${writeReferencesToFile pkgs.pkgsMusl.mesa.drivers}) \ <(sort ${writeReferencesToFile basePaths}) | sed p) pushd "$out" -- 2.40.1