diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2021-11-08 23:34:29 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2021-11-14 15:15:12 +0000 |
| commit | 20caa76219ce345f334db86c1ba02a0d761a428d (patch) | |
| tree | 74152d5882c0a0af5066b204b43d7bff72082c84 /pkgs/tools/text | |
| parent | 4e1852096f34f3de5ad64b262c969bdcd7f4bfc7 (diff) | |
| download | nixpkgs-20caa76219ce345f334db86c1ba02a0d761a428d.tar nixpkgs-20caa76219ce345f334db86c1ba02a0d761a428d.tar.gz nixpkgs-20caa76219ce345f334db86c1ba02a0d761a428d.tar.bz2 nixpkgs-20caa76219ce345f334db86c1ba02a0d761a428d.tar.lz nixpkgs-20caa76219ce345f334db86c1ba02a0d761a428d.tar.xz nixpkgs-20caa76219ce345f334db86c1ba02a0d761a428d.tar.zst nixpkgs-20caa76219ce345f334db86c1ba02a0d761a428d.zip | |
sourceHighlight: fix tests on clang and gcc-12
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/source-highlight/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index 4a7b588cd9d..289740854f2 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -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 |