Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fab41ed0e622
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 979e6e67d32a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 6, 2020

  1. source-highlight: Skip building docs when cross-compiling

    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.
    kampka committed Sep 6, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    kampka Christian Kampka
    Copy the full SHA
    cbfc33a View commit details

Commits on Jan 17, 2021

  1. Merge pull request #96762 from kampka/source-highlight

    source-highlight: Skip building docs when cross-compiling
    symphorien authored Jan 17, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    979e6e6 View commit details
Showing with 8 additions and 0 deletions.
  1. +8 −0 pkgs/tools/text/source-highlight/default.nix
8 changes: 8 additions & 0 deletions pkgs/tools/text/source-highlight/default.nix
Original file line number Diff line number Diff line change
@@ -12,6 +12,14 @@ stdenv.mkDerivation {
sha256 = "148w47k3zswbxvhg83z38ifi85f9dqcpg7icvvw1cm6bg21x4zrs";
};

# 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 = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
substituteInPlace Makefile.in --replace "src doc tests" "src tests"
'';

strictDeps = true;
buildInputs = [ boost ];

configureFlags = [ "--with-boost=${boost.out}" ];