From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.3 (2019-12-06) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.2 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.3 Received: by atuin.qyliss.net (Postfix, from userid 496) id 7821F291B; Tue, 25 Aug 2020 16:48:40 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 3EE25286B; Tue, 25 Aug 2020 16:48:34 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 23DE12865; Tue, 25 Aug 2020 16:48:33 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id 3E7B42863 for ; Tue, 25 Aug 2020 16:48:29 +0000 (UTC) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 2DB695C00B2 for ; Tue, 25 Aug 2020 12:48:28 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Tue, 25 Aug 2020 12:48:28 -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=fm3; bh=UMpgRLqvsKHEUirGO96ykEMa51 cXVpvJfrMQoM0gfM0=; b=bUwTRGn8rSC7xI4OmrY38jXXdrA4/gV5CpbtV/6sAQ V1vziNlFtjvsu0ERYMaYA+ZC+QHJ2dHDaNXlvz0it1rxsMFVKf8AJmpj+oFwYnlk 18IDT8z2JdkkpE4GYVcF42SolOhiC/xr9qw3N87kEFl1eQsV6bjBxs3FivLbtdaw IhNiUixO3ubMAA3YPVtcs0csvEeCe6FtctfQcFtpQfFQdBiuxNgyMF4pTQVYX1Eg pyUIgqOqQQ9rhP0NLa5Zclytna2uZRWeZxqKy6cw8gNr/SzxyujgpyXnWjjih2jp sK5C6sILASrW0ezm88sP8+u7xbqsb7B/1/YysgdvYm5w== 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=fm3; bh=UMpgRLqvsKHEUirGO 96ykEMa51cXVpvJfrMQoM0gfM0=; b=bTYrEwu5Ef0+EQQHafvmuLdhhENjrh7CP F+itLEem6nVGCuro1cN7bOFNQcR/+IyMBiWvG6OHsZ1kYY07xW0gfrBm0WxhT7R+ LeKRbmi8d9jfrsI0RvQDhZm/QW0pEeawsX/hn2MShAvK+wHP0bejNp0kPBHrpyVL VJllaMerlMYSCcPcFw8rmE2D6eiwrREZkbZc/ooZ24zhXJ6OTq2nFEWSGD2Jahcs yjScQMF6mYfQ3VJWGhUnd5m4GYJZE2oQ399gfDybphvUAXVGid9UtCglnSNH1sJ1 Bsa0yzDJXggdfHO4TXmrCo3GZCNueYUlDnKasrRDunSYVK06Gv3Vg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedruddvtddguddtjecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpeetlhihshhsrgcutfhoshhsuceohhhisegrlhihshhsrgdrihhs qeenucggtffrrghtthgvrhhnpeehvdffgffhteeijefgteeftdfghfdvheeuhedvjedugf eggfeljefgleefvefgfeenucfkphepkeegrddukeegrddvvdeirddufeegnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepqhihlhhishhsseigvd dvtddrqhihlhhishhsrdhnvght X-ME-Proxy: Received: from x220.qyliss.net (p54b8e286.dip0.t-ipconnect.de [84.184.226.134]) by mail.messagingengine.com (Postfix) with ESMTPA id 76D1D3280066 for ; Tue, 25 Aug 2020 12:48:27 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id E217D3F8; Tue, 25 Aug 2020 16:48:25 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs] spectrumPackages.spectrum-vm: fix without Wayland Date: Tue, 25 Aug 2020 16:48:08 +0000 Message-Id: <20200825164808.8707-1-hi@alyssa.is> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: VJKT5NAVSVQ3Z4UN5GAHOES7TFT5274O X-Message-ID-Hash: VJKT5NAVSVQ3Z4UN5GAHOES7TFT5274O 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.27.0