* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15065

pkgs/tools/graphics/netpbm/default.nix

@@ -6,8 +6,11 @@ stdenv.mkDerivation {
   src = fetchsvn {
     url = https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced;
     rev = 844;
+    sha256 = "8729e63bb5cc9fd500a68d5aed91fa4b973ebc068e3014b47390ba7b4d85968e";
   };
 
+  NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
+
   buildInputs = [ flex zlib perl libpng libjpeg libxml2 ];
 
   configurePhase = "cp config.mk.in config.mk";

pkgs/tools/graphics/panomatic/default.nix

@@ -0,0 +1,18 @@
+{stdenv, fetchurl, boost, zlib}:
+
+stdenv.mkDerivation {
+  name = "panomatic-0.9.4";
+
+  src = fetchurl {
+    url = http://aorlinsk2.free.fr/panomatic/bin/panomatic-0.9.4-src.tar.bz2;
+    sha256 = "0vfkj3k3y8narwwijh996q2zzprjxbr2fhym15nm4fkq14yw4wwn";
+  };
+
+  buildInputs = [ boost zlib ];
+
+  meta = {
+    homepage = http://aorlinsk2.free.fr/panomatic/;
+    description = "Tool that automates the creation of control points in Hugin";
+    license = "GPLv2+";
+  };
+}