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: 7785df3b907f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d9fc44e72122
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 16, 2019

  1. highlight: use $CXX instead of c++ to build

    @illegalprime
    illegalprime committed Mar 16, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 916062A1C4748647
    Learn about vigilant mode
    Copy the full SHA
    3947d2e View commit details

Commits on Mar 18, 2019

  1. Merge pull request #57821 from illegalprime/fix/highlight-cross 

    highlight: use $CXX instead of c++ to build
    @Mic92
    Mic92 authored Mar 18, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d9fc44e View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/tools/text/highlight/default.nix
2 changes: 1 addition & 1 deletion pkgs/tools/text/highlight/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';

preConfigure = ''
makeFlags="PREFIX=$out conf_dir=$out/etc/highlight/"
makeFlags="PREFIX=$out conf_dir=$out/etc/highlight/ CXX=$CXX AR=$AR"
'';

meta = with stdenv.lib; {