nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #137365 from trofi/source-highlighting-updates

Browse Source
This commit is contained in:
Sandro
2021-09-11 15:47:22 +02:00
committed by GitHub
parent ff5297bcd3 1123630e12
commit 90edbde8e1
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, boost }:
{ lib, stdenv, fetchpatch, fetchurl, boost }:
stdenv.mkDerivation rec {
pname = "source-highlight";
@@ -9,10 +9,19 @@ stdenv.mkDerivation rec {
sha256 = "148w47k3zswbxvhg83z38ifi85f9dqcpg7icvvw1cm6bg21x4zrs";
};
patches = [
# gcc-11 compat upstream patch
(fetchpatch {
url = "http://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=904949c9026cb772dc93fbe0947a252ef47127f4";
sha256 = "1wnj0jmkmrwjww7qk9dvfxh8h06jdn7mi8v2fvwh95b6x87z5l47";
excludes = [ "ChangeLog" ];
})
];
# source-highlight uses it's own binary to generate documentation.
# During cross-compilation, that binary was built for the target
# platform architecture, so it can't run on the build host.
patchPhase = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
substituteInPlace Makefile.in --replace "src doc tests" "src tests"
'';
@@ -21,7 +30,12 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-boost=${boost.out}" ];
enableParallelBuilding = false;
doCheck = true;
enableParallelBuilding = true;
# Upstream uses the same intermediate files in multiple tests, running
# them in parallel by make will eventually break one or more tests.
enableParallelChecking = false;
outputs = [ "out" "doc" "dev" ];