diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2008-03-11 14:06:52 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2008-03-11 14:06:52 +0000 |
| commit | 498f57b9a8a0ae13d74d2cd9039b6ed6bbb8f14f (patch) | |
| tree | f8a93eb1c3a1a5495289ebb8608a7a0446ed2ec4 | |
| parent | 3d2fe2382fb3769631cb748dbdc7469507e30a61 (diff) | |
AsciiDoc: Fix `CONF_DIR' in the executables.
svn path=/nixpkgs/trunk/; revision=11056
| -rw-r--r-- | pkgs/tools/typesetting/asciidoc/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 373abac7e7a36..ab6c9aef0aef4 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, python }: +{ fetchurl, stdenv, python, bash }: stdenv.mkDerivation rec { name = "asciidoc-8.2.5"; @@ -9,10 +9,12 @@ stdenv.mkDerivation rec { patchPhase = '' cat "asciidoc.py" | \ - sed -e 's,^#!/usr/bin/env python,#!${python}/bin/python,g' \ + sed -e "s,^#!/usr/bin/env python,#!${python}/bin/python,g ; + s,^CONF_DIR = .*$,CONF_DIR = \"$out/etc/asciidoc\",g" \ > ,,tmp && mv ,,tmp asciidoc.py && chmod +x asciidoc.py cat "a2x" | \ - sed -e 's,^#!/usr/bin/env bash,#!${stdenv.shell},g' \ + sed -e "s,^#!/usr/bin/env bash,#!${bash},g ; + s,^CONF_DIR=.*$,CONF_DIR=\"$out/etc/asciidoc\",g" \ > ,,tmp && mv ,,tmp a2x && chmod +x a2x cat "install.sh" | \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbec1f2e678e9..b8570bcd5f5da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -417,7 +417,7 @@ rec { }; asciidoc = import ../tools/typesetting/asciidoc { - inherit fetchurl stdenv python; + inherit fetchurl stdenv bash python; }; bibtextools = import ../tools/typesetting/bibtex-tools { |