From 2ad5b861163f30ba721c8c4cf27e4272bf9ac7ff Mon Sep 17 00:00:00 2001 From: Adam Curtis Date: Thu, 9 Jan 2025 09:43:41 +1300 Subject: [PATCH] discord-rpc: patch to add unreleased PR discord-rpc#387 See https://github.com/discord/discord-rpc/pull/387 --- .../0002-Update-.clang-format.patch | 24 +++++++++++++++++++ .../libraries/discord-rpc/default.nix | 6 +++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/discord-rpc/0002-Update-.clang-format.patch diff --git a/pkgs/development/libraries/discord-rpc/0002-Update-.clang-format.patch b/pkgs/development/libraries/discord-rpc/0002-Update-.clang-format.patch new file mode 100644 index 0000000000000..2a177413a5ec5 --- /dev/null +++ b/pkgs/development/libraries/discord-rpc/0002-Update-.clang-format.patch @@ -0,0 +1,24 @@ +From dc26645316a1996a10995d9f5fae53ca1caddade Mon Sep 17 00:00:00 2001 +From: Matt Dallmeyer +Date: Fri, 29 Sep 2023 14:23:15 -0700 +Subject: [PATCH 2/2] Update .clang-format + +--- + .clang-format | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/.clang-format b/.clang-format +index 1be8390..e8a5e85 100644 +--- a/.clang-format ++++ b/.clang-format +@@ -34,7 +34,6 @@ DerivePointerAlignment: false + DisableFormat: false + FixNamespaceComments: true + ForEachMacros: [] +-IndentCaseLabels: false + IncludeCategories: + - Regex: '^("|<)stdafx\.h(pp)?("|>)' + Priority: -1 +-- +2.47.0 + diff --git a/pkgs/development/libraries/discord-rpc/default.nix b/pkgs/development/libraries/discord-rpc/default.nix index ced4630658f84..da1df1249f8fa 100644 --- a/pkgs/development/libraries/discord-rpc/default.nix +++ b/pkgs/development/libraries/discord-rpc/default.nix @@ -39,6 +39,12 @@ stdenv.mkDerivation rec { url = "https://github.com/discord/discord-rpc/commit/963aa9f3e5ce81a4682c6ca3d136cddda614db33.patch"; hash = "sha256-BUHeV6uRJJN5QxyVwujyHDmAbskjWbkPZN/Fz3CcE5s="; }) + # Adds unreleased PR https://github.com/discord/discord-rpc/pull/387 + (fetchpatch { + name = "0002-Update-.clang-format.patch"; + url = "https://github.com/discord/discord-rpc/commit/dc26645316a1996a10995d9f5fae53ca1caddade.patch"; + hash = "sha256-geofgXwfbDsvsYCz92IVFrdvBDiGvMBiFd3GEbsdoHU="; + }) ]; meta = with lib; {