diff options
| author | Shea Levy <shea@shealevy.com> | 2011-09-06 17:10:08 +0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2011-09-06 17:10:08 +0000 |
| commit | 9dd496c687eff3a641d3ca528ca3292331217ad5 (patch) | |
| tree | 39a66004362609ea08ff2baeb3007fe2acd989a8 | |
| parent | viewmtn: Update to new url (diff) | |
| download | nixpkgs-9dd496c687eff3a641d3ca528ca3292331217ad5.tar.gz | |
highlight: Update to 3.5
svn path=/nixpkgs/trunk/; revision=29064
| -rw-r--r-- | pkgs/tools/text/highlight/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 53f562eb10a4..40a3bcf78ea5 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchurl, getopt }: +{ stdenv, fetchurl, getopt, lua, boost }: stdenv.mkDerivation rec { - name = "highlight-2.6.10"; + name = "highlight-3.5"; src = fetchurl { url = "http://www.andre-simon.de/zip/${name}.tar.bz2"; - sha256 = "18f2ki9pajxlp0aq4ingxj7m0cp7wlbc40xm25pnxc1yis9vlira"; + sha256 = "0jpidd2fwn5mbrgzjmh53qvfmqqp6g0mah7i5zsf9bd71ga1lp28"; }; - buildInputs = [getopt]; + buildInputs = [ getopt lua boost ]; - preBuild = '' - sed -e '/#include <map>/i#include <stdio.h>' -i src/re/Pattern.h - ''; - - makeFlags = ["PREFIX=$out"]; + makeFlags = [ + "PREFIX=$(out)" + "conf_dir=$(out)/etc/highlight/" + ]; meta = { description = "Source code highlighting tool"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19adc62dff70..67d2adc56f4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -812,7 +812,9 @@ let hevea = callPackage ../tools/typesetting/hevea { }; - highlight = callPackage ../tools/text/highlight { }; + highlight = callPackage ../tools/text/highlight { + lua = lua5; + }; host = callPackage ../tools/networking/host { }; |