From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 386AC71C00; Fri, 30 Sep 2022 19:48:55 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 2740271BBF; Fri, 30 Sep 2022 19:48:51 +0000 (UTC) Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by atuin.qyliss.net (Postfix) with ESMTPS id 126DB71B9B for ; Fri, 30 Sep 2022 19:48:49 +0000 (UTC) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 9FED832009E9; Fri, 30 Sep 2022 15:48:47 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Fri, 30 Sep 2022 15:48:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=puckipedia.com; h=cc:cc:content-transfer-encoding:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1664567327; x= 1664653727; bh=Dl7JTdl7Fp8w3AnuRopK6Nq+lGYfs89IQqP7pj9z/yY=; b=c 9XxNh9NWtPmvNr9p+p2PjaFpp1Bw3UUZyyYdgXzwBL3vTVpbcr6mnsUlS3R4KLDF Ur1ByEv0hKSoNajrTENEHHSimHYQ+VKeT4U1+hI45oxjVQ2pNIX406+3l+AnNruU fFdxYrSjziL69jqVVOxtA4sWPULFoOQ/pLv9igQPu5WW3FE0wdeSgGkLpxijqJQu x9komBq+E4Ic2dE4eh+MPBukj5Wyxp9clSBUkYPHQCkvQKWWBVodZT8+ev/bibIV MFLSuJFmosAmnhZH7ZiUXfefB5OWTKUZwfCJhJVe9AWHX5ILCycwgYxINtLJQM2k hSDmtXXjKbX1CL3i55vCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding: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=fm2; t=1664567327; x=1664653727; bh=Dl7JTdl7Fp8w3 AnuRopK6Nq+lGYfs89IQqP7pj9z/yY=; b=UcjNnLHjch5lcdLerKZ0exIgLYLm1 jxFaOGf7H7yDRx80hP6e6T/Gq+xiFcIThReD1w3i3HYXcY6PSzNcbWdFuDn14L0k Njc2Aou4i5UYcuvme4xSNkwWmtyBWo8ILdBaQftkJV2IQJOApKWv9Asl5fhKjdn9 KJKDXBJQsKGn1WuR66+XNNwESJBrG8QpJjdYD5oRL77b7Adl2Bex/rhaiDMd7dM3 HOMCHbdsjslxjPKh+YZrJi0h+cE/kmYZ91OHs5jWgBLCuu7+wjLe4HixLX/Nd0Bq 1FslwoOGODvUihEYTCnk0903Vm3tC46oz6wp0nwEkZQRJ7a7R6Q7IeWFQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeehvddgudegvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestd ekredtredttdenucfhrhhomheprfhutghkucfovggvrhgsuhhrghcuoehpuhgtkhesphhu tghkihhpvgguihgrrdgtohhmqeenucggtffrrghtthgvrhhnpeelheevgfdthfegudeggf fhieeugfffteeiuedugeffueegtedvleetieejledukeenucffohhmrghinhepghhithhh uhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepphhutghksehpuhgtkhhiphgvughirgdrtghomh X-ME-Proxy: Feedback-ID: ie69944d9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 30 Sep 2022 15:48:46 -0400 (EDT) From: Puck Meerburg To: devel@spectrum-os.org Subject: [RFC PATCH nixpkgs 3/4] sway: apply security-context patches Date: Fri, 30 Sep 2022 19:45:59 +0000 Message-Id: <20220930194600.1033126-4-puck@puckipedia.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220930194600.1033126-1-puck@puckipedia.com> References: <20220930194600.1033126-1-puck@puckipedia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: JH64WVFNOCC7EIFTZ2W6H6ZNI3H3HUYK X-Message-ID-Hash: JH64WVFNOCC7EIFTZ2W6H6ZNI3H3HUYK X-MailFrom: puck@puckipedia.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Puck Meerburg 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: Signed-off-by: Puck Meerburg --- .../window-managers/sway/default.nix | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 61925e4ed0b..43d107b11b5 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -4,6 +4,7 @@ , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , wlroots, wayland-protocols, libdrm , nixosTests +, fetchpatch # Used by the NixOS module: , isNixOS ? false @@ -39,6 +40,27 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit swaybg; }) + + (fetchpatch { + url = "https://github.com/puckipedia/sway/commit/6b45b7dbc03f5f0184ab0f45d36690df1cc869bd.patch"; + sha256 = "sha256-LxW+02eTsm/XeKCwhyQfF6FlVVBsdTsybJi7nM4vahI="; + }) + (fetchpatch { + url = "https://github.com/puckipedia/sway/commit/f7733c0444b9cc55fbbce20259db4fc97168827a.patch"; + sha256 = "sha256-+Dsbfwh6+a6j+srMszisRTSsM6U99iG+4eHIz01qGkQ="; + }) + (fetchpatch { + url = "https://github.com/puckipedia/sway/commit/683caa484c993d8d46c703f1d18beb2000f6a302.patch"; + sha256 = "sha256-zTXAveiTfIDp96GmuKx+lWpGTjNexGOCzLxfgKEt8KQ="; + }) + (fetchpatch { + url = "https://github.com/puckipedia/sway/commit/2e769c16e69eedd410372c37bf2492d982689488.patch"; + sha256 = "sha256-4Ap9C9bKqaYxbkYB0pBkywqvsYyYTf3wUYgKClfEkRE="; + }) + (fetchpatch { + url = "https://github.com/puckipedia/sway/commit/4ec88a243661f0cf53ede8d354b533a57cfe2208.patch"; + sha256 = "sha256-g9Ua8RdHzEVgw+KbnJkzHvSD2HVOybpOdPhUw3cCPyY="; + }) ] ++ lib.optionals (!isNixOS) [ # References to /nix/store/... will get GC'ed which causes problems when # copying the default configuration: -- 2.35.1