Merge branch 'master' into staging

This commit is contained in:
Thomas Tuegel
2015-06-25 09:15:05 -05:00
117 changed files with 13095 additions and 14673 deletions
+1 -1
View File
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ getopt lua boost pkgconfig ];
preConfigure = ''makeFlags="PREFIX=$out conf_dir=$out/etc/highlight"'';
preConfigure = ''makeFlags="PREFIX=$out conf_dir=$out/etc/highlight/"'';
meta = {
description = "Source code highlighting tool";