Skip to content

Commit b074b73

Browse files
discord-rpc: patch to add unreleased PR discord-rpc#387
See discord/discord-rpc#387
1 parent 9a78276 commit b074b73

File tree

2 files changed

+29
-0
lines changed

2 files changed

+29
-0
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From dc26645316a1996a10995d9f5fae53ca1caddade Mon Sep 17 00:00:00 2001
2+
From: Matt Dallmeyer <[email protected]>
3+
Date: Fri, 29 Sep 2023 14:23:15 -0700
4+
Subject: [PATCH 2/2] Update .clang-format
5+
6+
---
7+
.clang-format | 1 -
8+
1 file changed, 1 deletion(-)
9+
10+
diff --git a/.clang-format b/.clang-format
11+
index 1be8390..e8a5e85 100644
12+
--- a/.clang-format
13+
+++ b/.clang-format
14+
@@ -34,7 +34,6 @@ DerivePointerAlignment: false
15+
DisableFormat: false
16+
FixNamespaceComments: true
17+
ForEachMacros: []
18+
-IndentCaseLabels: false
19+
IncludeCategories:
20+
- Regex: '^("|<)stdafx\.h(pp)?("|>)'
21+
Priority: -1
22+
--
23+
2.47.0
24+

pkgs/development/libraries/discord-rpc/default.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ stdenv.mkDerivation rec {
3737
url = "https://github.com/discord/discord-rpc/commit/963aa9f3e5ce81a4682c6ca3d136cddda614db33.patch";
3838
hash = "sha256-BUHeV6uRJJN5QxyVwujyHDmAbskjWbkPZN/Fz3CcE5s=";
3939
})
40+
(fetchpatch {
41+
name = "0002-Update-.clang-format.patch";
42+
url = "https://salsa.debian.org/debian/zbar/-/raw/debian/0.23.92-9/debian/patches/0004-Add-bounds-check-for-CVE-2023-40890.patch";
43+
hash = "sha256-YgiptwXpRpz0qIcXBpARfIzSB8KYmksZR58o5yFPahs=";
44+
})
4045
];
4146

4247
meta = with lib; {

0 commit comments

Comments
 (0)