diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/typesetting')
4 files changed, 18 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/tools/typesetting/fop/default.nix b/nixpkgs/pkgs/tools/typesetting/fop/default.nix index 5f926f771c5f..9240926ab5b4 100644 --- a/nixpkgs/pkgs/tools/typesetting/fop/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/fop/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ant, jdk }: +{ fetchurl, stdenv, ant, jdk, runtimeShell }: stdenv.mkDerivation rec { name = "fop-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # There is a fop script in the source archive, but it has many impurities. # Instead of patching out 90 % of the script, we write our own. cat > "$out/bin/fop" <<EOF - #!${stdenv.shell} + #!${runtimeShell} java_exec_args="-Djava.awt.headless=true" exec ${jdk.jre}/bin/java \$java_exec_args -classpath "$out/lib/*" org.apache.fop.cli.Main "\$@" EOF diff --git a/nixpkgs/pkgs/tools/typesetting/pygmentex/default.nix b/nixpkgs/pkgs/tools/typesetting/pygmentex/default.nix index fef6c9087c53..662f7717b33b 100644 --- a/nixpkgs/pkgs/tools/typesetting/pygmentex/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/pygmentex/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchFromBitbucket, python2Packages }: python2Packages.buildPythonApplication rec { - name = "pygmentex-${version}"; + pname = "pygmentex"; version = "0.8"; + tlType = "run"; src = fetchFromBitbucket { owner = "romildo"; - repo = "pygmentex"; + repo = pname; rev = version; sha256 = "07dnv7hgppy15bda2kcbrlvfqzl6lhza80klc7133dwg8q92hm6m"; }; - pythonPath = [ python2Packages.pygments python2Packages.chardet ]; + pythonPath = with python2Packages; [ pygments chardet ]; dontBuild = true; @@ -20,6 +21,15 @@ python2Packages.buildPythonApplication rec { installPhase = '' mkdir -p $out/bin cp -a pygmentex.py $out/bin + + mkdir -p $out/scripts/pygmentex + ln -s $out/bin/pygmentex.py $out/scripts/pygmentex + + mkdir -p $out/tex/latex/pygmentex + cp -a pygmentex.sty $out/tex/latex/pygmentex + + mkdir -p $out/doc/latex/pygmentex + cp -a README demo.* blueshade.png Factorial.java $out/doc/latex/pygmentex ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/typesetting/rubber/default.nix b/nixpkgs/pkgs/tools/typesetting/rubber/default.nix index 92c1cc526955..21d83dd1dd06 100644 --- a/nixpkgs/pkgs/tools/typesetting/rubber/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/rubber/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "178dmrp0mza5gqjiqgk6dqs0c10s0c517pk6k9pjbam86vf47a1p"; }; - propagatedBuildInputs = [ texinfo ]; + nativeBuildInputs = [ texinfo ]; # I couldn't figure out how to pass the proper parameter to disable pdf generation, so we # use sed to change the default diff --git a/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix b/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix index 491116127d2e..17c153cd9f01 100644 --- a/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/scdoc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "scdoc-${version}"; - version = "1.9.0"; + version = "1.9.4"; src = fetchurl { url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"; - sha256 = "0w81mz99ap037ih8ws6zsjkcfr90hgjmnplsg4c6bqdj50ad32n6"; + sha256 = "00zc3rzj97gscby31djlqyczvqpyhrl66i44czwzmmn7rc5j03m1"; }; postPatch = '' |