summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPascal Wittmann <mail@pascal-wittmann.de>2014-10-04 22:34:25 +0200
committerPascal Wittmann <mail@pascal-wittmann.de>2014-10-04 23:13:32 +0200
commit65242d4a744f818e0ca459e711793fa9c2b55238 (patch)
tree76a80d6266cb3028b0e247334946ebad04d759dd /pkgs
parentb1e52be91d78b657439d6c1abf35f4dff3ef51e3 (diff)
downloadnixpkgs-65242d4a744f818e0ca459e711793fa9c2b55238.tar
nixpkgs-65242d4a744f818e0ca459e711793fa9c2b55238.tar.gz
nixpkgs-65242d4a744f818e0ca459e711793fa9c2b55238.tar.bz2
nixpkgs-65242d4a744f818e0ca459e711793fa9c2b55238.tar.lz
nixpkgs-65242d4a744f818e0ca459e711793fa9c2b55238.tar.xz
nixpkgs-65242d4a744f818e0ca459e711793fa9c2b55238.tar.zst
nixpkgs-65242d4a744f818e0ca459e711793fa9c2b55238.zip
pdfjam: update from 1.20 to 2.08
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/typesetting/pdfjam/builder.sh2
-rw-r--r--pkgs/tools/typesetting/pdfjam/default.nix15
2 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/tools/typesetting/pdfjam/builder.sh b/pkgs/tools/typesetting/pdfjam/builder.sh
index 9fcb80f6866..720ddeae78d 100644
--- a/pkgs/tools/typesetting/pdfjam/builder.sh
+++ b/pkgs/tools/typesetting/pdfjam/builder.sh
@@ -3,7 +3,7 @@ source $stdenv/setup
 tar zxvf $src
 
 mkdir -p $out/bin
-cp pdfjam/scripts/* $out/bin
+cp pdfjam/bin/* $out/bin
 
 mkdir -p $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
index 1b8d7b5e8d8..f8eafb221a3 100644
--- a/pkgs/tools/typesetting/pdfjam/default.nix
+++ b/pkgs/tools/typesetting/pdfjam/default.nix
@@ -1,10 +1,17 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "pdfjam-1.20";
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "pdfjam-${version}";
+  version = "2.08";
+  url-version = stdenv.lib.replaceChars ["."] [""] version;
+
   builder = ./builder.sh;
+
   src = fetchurl {
-    url = http://www.warwick.ac.uk/go/pdfjam/pdfjam_1.20.tgz;
-    sha256 = "05g3mx7mb6h15ivbv0f53r369xphy8ad8a2xblpnk9mrnlrkaxy9";
+    url = "http://go.warwick.ac.uk/pdfjam/pdfjam_${url-version}.tgz";
+    sha256 = "1wy0xhcy27d7agby598s20ba48s4yg5qkzr6anc6q1xdryccacf7";
   };
+
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     maintainers = [ maintainers.mornfall ];