From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.3 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 Received: by atuin.qyliss.net (Postfix, from userid 496) id B42B0303C; Mon, 15 Mar 2021 13:56:25 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id A6E142EEB; Mon, 15 Mar 2021 13:56:05 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 1C7042F74; Mon, 15 Mar 2021 13:56:02 +0000 (UTC) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by atuin.qyliss.net (Postfix) with ESMTPS id 9E2A22F70 for ; Mon, 15 Mar 2021 13:55:57 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 218705C0160 for ; Mon, 15 Mar 2021 09:55:55 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 15 Mar 2021 09:55:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm2; bh=fl7cr3pFOotVv3vNTZ/8rMdzpW yDnmWnoEmAjOy61p8=; b=rzdvQYV9U1Zn2moMm4WQ3Z3pjSYAdGb/E3mOKl+QDF +73m1GW3648IlUy3jmtHwrBNXexJ9yX3zktNCmTdQGzotBIK8nYzSPPgvB4oAUzt RYGiBhU0anCPCrjuS795pMv5GeQjHyx2oKDtYJrdYgihwfV6dEkn443ZaIdol0QF JvxmLreFG58zh1+jqZysv2IwCGfmcrZkBYQBVt483YXGvo4Zjp1uZiaaw5UxVYj+ jMQr/sA4IKH/PlhfzBcUWNIjT2OqirRhPXOKVw7a56XDQ/AQwPfjpfYfKL1tMOQb RsIBbkj1eKQLNGypvhrP0h9PfegUuVksi2QkmWN+4lrg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=fl7cr3pFOotVv3vNT Z/8rMdzpWyDnmWnoEmAjOy61p8=; b=MQMj4dp5YdtnNk00fIaMfRZjLGvvi8fSP Pb/aHM4PFRKXew4cjL0SqFOyBnqc9kiArfGNwGjfKDcfczpj8sLIuBrcVMERk46p 3XfsUbKKCip/CCD+ik4n6uW8z0pILagz5ZgHnupVxg8BQwQlvzOPyMG4Vi4GDT/x 9gONprOPTG7jxlH5h/w1WSilHN7L3eD3bqJfXl4VUh9W6VCrFNo+8Xq2JH2dnmVf 8A9UDPQZOpCw0qCQkzNOuSEpq8rYl2x4iejvYKBP9QC2xqeYboy9QAdcdmP4f98z qbneXQPODxilrGS/98IFKrSYEbu6ZvLii8m1t8RJxxMBrZ6O4kWow== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddvledgheeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhisheq necuggftrfgrthhtvghrnhephedvfffghfetieejgfetfedtgffhvdehueehvdejudfgge fgleejgfelfeevgfefnecukfhppeekgedrudekgedrvdefvddrudektdenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehqhihlihhsshesgidvvd dtrdhqhihlihhsshdrnhgvth X-ME-Proxy: Received: from x220.qyliss.net (p54b8e8b4.dip0.t-ipconnect.de [84.184.232.180]) by mail.messagingengine.com (Postfix) with ESMTPA id 1EF9C1080063 for ; Mon, 15 Mar 2021 09:55:54 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 1CDDC1AA3; Mon, 15 Mar 2021 13:55:52 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs] spectrumPackages.spectrum-vm: fix without Wayland Date: Mon, 15 Mar 2021 13:55:39 +0000 Message-Id: <20210315135540.4980-1-hi@alyssa.is> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: WWDCJGDZVJWEVHOE7F3IBZDM45P2JMTG X-Message-ID-Hash: WWDCJGDZVJWEVHOE7F3IBZDM45P2JMTG X-MailFrom: qyliss@x220.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.3.1 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: This errored because of the undefined XDG_RUNTIME_DIR or WAYLAND_DISPLAY. I'd tried to prevent that by disabling -e around this part, but it turns out I should have disabled -u instead. --- pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in b= /pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in index 4fa0287a805..8d95c178689 100755 --- a/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in +++ b/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in @@ -55,7 +55,7 @@ do esac done =20 -set +e +set +u if [ -n "$XDG_RUNTIME_DIR" ] then set -- -s "$XDG_RUNTIME_DIR" "$@" @@ -63,7 +63,7 @@ then then set -- --wayland-sock "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" "$@" fi fi -set -e +set -u =20 exec "$crosvm" run \ -p init=3D/sbin/init \ --=20 2.30.0