diff --git a/pkgs/development/libraries/discord-rpc/0001-Update-.clang-format.patch b/pkgs/development/libraries/discord-rpc/0001-Update-.clang-format.patch new file mode 100644 index 00000000000000..2a177413a5ec56 --- /dev/null +++ b/pkgs/development/libraries/discord-rpc/0001-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 c9c007adb8c69f..7b85ec1a18d6ad 100644 --- a/pkgs/development/libraries/discord-rpc/default.nix +++ b/pkgs/development/libraries/discord-rpc/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, rapidjson, AppKit, @@ -32,6 +33,15 @@ stdenv.mkDerivation rec { "-DBUILD_EXAMPLES=${lib.boolToString buildExamples}" ]; + patches = [ + # Adds unreleased PR https://github.com/discord/discord-rpc/pull/387 + (fetchpatch { + name = "0001-Update-.clang-format.patch"; + url = "https://github.com/discord/discord-rpc/commit/dc26645316a1996a10995d9f5fae53ca1caddade.patch"; + hash = "sha256-geofgXwfbDsvsYCz92IVFrdvBDiGvMBiFd3GEbsdoHU="; + }) + ]; + meta = with lib; { description = "Official library to interface with the Discord client"; homepage = "https://github.com/discordapp/discord-rpc";