diff options
| author | Randy Eckenrode <randy@largeandhighquality.com> | 2023-11-03 18:57:31 -0400 |
|---|---|---|
| committer | Randy Eckenrode <randy@largeandhighquality.com> | 2023-11-04 18:10:07 -0400 |
| commit | 3f99aef10e40d5482538201d40faffd737fa0d20 (patch) | |
| tree | 85b431bb01cd87644f09b6a515f8c42ea26a88e3 /pkgs/tools/text/source-highlight | |
| parent | b7a9cd56f348c69a0b16824416d75934bc369256 (diff) | |
| download | nixlib-3f99aef10e40d5482538201d40faffd737fa0d20.tar nixlib-3f99aef10e40d5482538201d40faffd737fa0d20.tar.gz nixlib-3f99aef10e40d5482538201d40faffd737fa0d20.tar.bz2 nixlib-3f99aef10e40d5482538201d40faffd737fa0d20.tar.lz nixlib-3f99aef10e40d5482538201d40faffd737fa0d20.tar.xz nixlib-3f99aef10e40d5482538201d40faffd737fa0d20.tar.zst nixlib-3f99aef10e40d5482538201d40faffd737fa0d20.zip | |
source-highlight: fix build with clang 16
Fetch upstream patch to add C++17 compatibility (the default in clang 16) and standardize fetchpatch URLs and hashes.
Diffstat (limited to 'pkgs/tools/text/source-highlight')
| -rw-r--r-- | pkgs/tools/text/source-highlight/default.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index c8a775e64459..d20b3692f31c 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -14,16 +14,24 @@ stdenv.mkDerivation rec { patches = [ # gcc-11 compat upstream patch (fetchpatch { - url = "http://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=904949c9026cb772dc93fbe0947a252ef47127f4"; - sha256 = "1wnj0jmkmrwjww7qk9dvfxh8h06jdn7mi8v2fvwh95b6x87z5l47"; + url = "https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=904949c9026cb772dc93fbe0947a252ef47127f4"; + hash = "sha256-h9DyD+pmlQT5dmKjWI9t0gCIYHe7pYkP55LnOqsE0vI="; excludes = [ "ChangeLog" ]; }) # Upstream fix for clang-13 and gcc-12 test support (fetchpatch { name = "gcc-12.patch"; - url = "http://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=ab9fe5cb9b85c5afab94f2a7f4b6d7d473c14ee9"; - sha256 = "1v33zd2766k7cdgmajw2lffw9wd7v4f8z01f40z53f6bp608nr62"; + url = "https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=ab9fe5cb9b85c5afab94f2a7f4b6d7d473c14ee9"; + hash = "sha256-wmSLgLnLuFE+IC6AjxzZp/HEnaOCS1VfY2cac0T7Y+w="; + }) + ] ++ lib.optionals stdenv.cc.isClang [ + # Adds compatibility with C++17 by removing the `register` storage class specifier. + (fetchpatch { + name = "remove-register-keyword"; + url = "https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=416b39758dba2c74515584514a959ad1b0ad50d1"; + hash = "sha256-R5A7IGHhU82EqceMCsuNBanhRz4dFVqiaH8637dr7jw="; + includes = [ "lib/*" ]; }) ]; |