diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-08-22 19:29:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-08-22 19:29:09 +0200 |
| commit | c1e62e7e91403112ad64b258e9a192dffba17144 (patch) | |
| tree | 4486172766655232a00360791fc2779296d37e98 /pkgs/tools/typesetting | |
| parent | af0e6b6b2b41eb7ebd3484fb4fbefd06a5b2a8b2 (diff) | |
| parent | d28a189af684e9ef61cc26b83e6e3798fe44b6f8 (diff) | |
| download | nixlib-c1e62e7e91403112ad64b258e9a192dffba17144.tar nixlib-c1e62e7e91403112ad64b258e9a192dffba17144.tar.gz nixlib-c1e62e7e91403112ad64b258e9a192dffba17144.tar.bz2 nixlib-c1e62e7e91403112ad64b258e9a192dffba17144.tar.lz nixlib-c1e62e7e91403112ad64b258e9a192dffba17144.tar.xz nixlib-c1e62e7e91403112ad64b258e9a192dffba17144.tar.zst nixlib-c1e62e7e91403112ad64b258e9a192dffba17144.zip | |
Merge branch 'master' into x-updates
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/lhs2tex/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/xmlto/default.nix | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix index 2b96ae526c40..ec1c9021522f 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -1,18 +1,18 @@ -{cabal, texLive, regexCompat}: +{ cabal, filepath, mtl, regexCompat, texLive }: cabal.mkDerivation (self: { pname = "lhs2tex"; version = "1.18.1"; - name = self.fname; sha256 = "0j4n7vkabsggn94gbwixy1vmckdck2nggdiqvk6n9nx164if5jnw"; - extraBuildInputs = [regexCompat texLive]; - + isLibrary = false; + isExecutable = true; + buildDepends = [ filepath mtl regexCompat ]; + extraLibraries = [ texLive ]; postInstall = '' mkdir -p "$out/share/doc/$name" cp doc/Guide2.pdf $out/share/doc/$name mkdir -p "$out/nix-support" ''; - meta = { homepage = "http://www.andres-loeh.de/lhs2tex/"; description = "Preprocessor for typesetting Haskell sources with LaTeX"; diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 423772385958..c72192317b77 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { license = "GPLv2+"; homepage = https://fedorahosted.org/xmlto/; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } |