diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 6 | ||||
| -rw-r--r-- | pkgs/system/populate-cache.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/hevea/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/hevea/default.nix | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 8473e519880c..cf848b06f523 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -117,9 +117,9 @@ rec { inherit (xlibs) libXaw; }; - ##hevea = (import ../tools/typesetting/hevea) { - ## inherit fetchurl stdenv ocaml; - ##}; + hevea = (import ../tools/typesetting/hevea) { + inherit fetchurl stdenv ocaml; + }; ### SHELLS diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix index 1a971334deb9..0970a87880f6 100644 --- a/pkgs/system/populate-cache.nix +++ b/pkgs/system/populate-cache.nix @@ -58,7 +58,7 @@ let { uml nix ocaml -# hevea + hevea ;}; diff --git a/pkgs/tools/typesetting/hevea/builder.sh b/pkgs/tools/typesetting/hevea/builder.sh index 34116917e0b4..895d8015e06c 100644 --- a/pkgs/tools/typesetting/hevea/builder.sh +++ b/pkgs/tools/typesetting/hevea/builder.sh @@ -1,5 +1,7 @@ . $stdenv/setup || exit 1 +mkdir -p $out/bin $out/lib + tar xvfz $src || exit 1 cd hevea-* || exit 1 sed s+/usr/local+$out+ Makefile > Makefile.new || exit 1 diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index 57a19f331faf..dfa8a43974a0 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, ocaml}: stdenv.mkDerivation { - name = "gnupatch-2.5.4"; + name = "hevea-1.07"; builder = ./builder.sh; src = fetchurl { url = http://pauillac.inria.fr/~maranget/hevea/distri/hevea-1.07.tar.gz; md5 = "561d7a2c10ea9e6a5b352c24d9b65998"; }; - buildInputs = [ocaml] + buildInputs = [ocaml]; } |