nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-22 20:14:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #145945 from trofi/fix-sourceHighlight-for-gcc-12

Browse Source
This commit is contained in:
Sandro 2021-11-19 17:16:04 +01:00 committed by GitHub
commit f4de9063c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/text/source-highlight/default.nix
View File

@ -18,6 +18,13 @@ stdenv.mkDerivation rec {
sha256 = "1wnj0jmkmrwjww7qk9dvfxh8h06jdn7mi8v2fvwh95b6x87z5l47";
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";
})
];
# source-highlight uses it's own binary to generate documentation.
@ -35,7 +42,7 @@ stdenv.mkDerivation rec {
"--with-bash-completion=${placeholder "out"}/share/bash_completion.d"
];
doCheck = !stdenv.cc.isClang;
doCheck = true;
enableParallelBuilding = true;
# Upstream uses the same intermediate files in multiple tests, running