diff options
| -rw-r--r-- | pkgs/development/compilers/jdk/jdk6-linux.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/pdfjam/builder.sh | 9 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/pdfjam/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 22 insertions, 1 deletions
diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/jdk/jdk6-linux.nix index 96647e2ac98..c3c30350dd9 100644 --- a/pkgs/development/compilers/jdk/jdk6-linux.nix +++ b/pkgs/development/compilers/jdk/jdk6-linux.nix @@ -32,7 +32,7 @@ assert swingSupport -> xlibs != null; /** * If jdk5 is added, make sure to use the original construct script. * This copy removes references to kinit, klist, ktab, which seem to be - * gone in jdk. + * gone in jdk6. */ construct = ./jdk6-construct.sh; inherit installjdk; diff --git a/pkgs/tools/typesetting/pdfjam/builder.sh b/pkgs/tools/typesetting/pdfjam/builder.sh new file mode 100644 index 00000000000..a710bc12023 --- /dev/null +++ b/pkgs/tools/typesetting/pdfjam/builder.sh @@ -0,0 +1,9 @@ +source $stdenv/setup + +tar zxvf $src + +ensureDir $out/bin +cp pdfjam/scripts/* $out/bin + +ensureDir $out/man/man1 +cp pdfjam/man1/* $out/man/man1 diff --git a/pkgs/tools/typesetting/pdfjam/default.nix b/pkgs/tools/typesetting/pdfjam/default.nix new file mode 100644 index 00000000000..e9b46eaa985 --- /dev/null +++ b/pkgs/tools/typesetting/pdfjam/default.nix @@ -0,0 +1,8 @@ +{stdenv, fetchurl}: stdenv.mkDerivation { + name = "pdfjam-1.20"; + builder = ./builder.sh; + src = fetchurl { + url = http://www.warwick.ac.uk/go/pdfjam/pdfjam_1.20.tgz; + sha256 = "05g3mx7mb6h15ivbv0f53r369xphy8ad8a2xblpnk9mrnlrkaxy9"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3811ac94dc5..dc4941fde20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -460,6 +460,10 @@ rec { inherit fetchurl stdenv zlib; }; + pdfjam = import ../tools/typesetting/pdfjam { + inherit fetchurl stdenv; + }; + ploticus = import ../tools/graphics/ploticus { inherit fetchurl stdenv zlib libpng; inherit (xlibs) libX11; |