jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

highlight: 3.28 -> 3.35 (#24068)

Browse Source 
* highlight: 3.28 -> 3.35

highlight: Add support for darwin, suspecting needs gcc

highlight: Fixed isDarwin [gcc]

* highlight: enable darwin build
This commit is contained in:
ndowens 2017-03-19 15:22:57 -05:00 committed by GitHub
parent 6ea3eefdfc
commit 93ec1ad987
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/tools/text/highlight/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, getopt, lua, boost, pkgconfig }:
{ stdenv, fetchurl, getopt, lua, boost, pkgconfig, gcc }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "highlight-${version}";
@ -9,16 +11,23 @@ stdenv.mkDerivation rec {
sha256 = "8a14b49f5e0c07daa9f40b4ce674baa00bb20061079473a5d386656f6d236d05";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ;
buildInputs = [ getopt lua boost ];
preConfigure = ''makeFlags="PREFIX=$out conf_dir=$out/etc/highlight/"'';
prePatch = stdenv.lib.optionalString stdenv.cc.isClang ''
substituteInPlace src/makefile \
--replace 'CXX=g++' 'CXX=clang++'
'';
preConfigure = ''
makeFlags="PREFIX=$out conf_dir=$out/etc/highlight/"
'';
meta = with stdenv.lib; {
description = "Source code highlighting tool";
homepage = "http://www.andre-simon.de/doku/highlight/en/highlight.php";
platforms = platforms.linux;
maintainers = maintainers.ndowens;
platforms = platforms.unix;
maintainers = [ maintainers.ndowens ];
};
}

7
pkgs/top-level/all-packages.nix
View File

@ -2255,9 +2255,12 @@ with pkgs;
hfsprogs = callPackage ../tools/filesystems/hfsprogs { };
highlight = callPackage ../tools/text/highlight {
highlight = callPackage ../tools/text/highlight ({
lua = lua5;
};
} // lib.optionalAttrs stdenv.isDarwin {
# doesn't build with clang_37
inherit (llvmPackages_38) stdenv;
});
homesick = callPackage ../tools/misc/homesick { };