5 files changed, 33 insertions, 10 deletions
diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
new file mode 100644
index 000000000000..b725f6bbf9fe
--- /dev/null
+++ b/pkgs/development/libraries/bullet/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, unzip, cmake}:
+
+stdenv.mkDerivation {
+  name = "bullet-2.78";
+  src = fetchurl {
+    url = "http://bullet.googlecode.com/files/bullet-2.78.zip";
+    sha256 = "10l2dclvv0di9mi9qp6xfy9vybx182xp2dyygabacrpr3p75s77k";
+  };
+  buildInputs = [ unzip cmake ];
+  configurePhase = ''
+    cmake -DBUILD_SHARED_LIBS=ON -DBUILD_EXTRAS=OFF -DBUILD_DEMOS=OFF .
+  '';
+
+  meta = {
+    description = "A professional free 3D Game Multiphysics Library";
+    longDescription = ''
+      Bullet 3D Game Multiphysics Library provides state of the art collision
+      detection, soft body and rigid body dynamics. 
+    '';
+    homepage = http://code.google.com/p/bullet/;
+    license = stdenv.lib.licenses.zlib;
+    maintainers = [ "Alexander Foremny <alexanderforemny@googlemail.com>" ];
+  };
+}
diff --git a/pkgs/development/libraries/haskell/http-date/default.nix b/pkgs/development/libraries/haskell/http-date/default.nix
index 1fbcc40a8147..a12542e38463 100644
--- a/pkgs/development/libraries/haskell/http-date/default.nix
+++ b/pkgs/development/libraries/haskell/http-date/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-date";
-  version = "0.0.1";
-  sha256 = "1dqnglz1l6h14339nd5q8sq90fak64ab8fs9fkhf8ipg5y0pzwbd";
+  version = "0.0.2";
+  sha256 = "18nijf3hswbvcd5amhbccqmgnanmslsmqpd2iixlvwz5hqb3ncvj";
   buildDepends = [ attoparsec ];
   meta = {
     description = "HTTP Date parser/formatter";
diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix
index 57a325a72349..24b93221d11e 100644
--- a/pkgs/development/libraries/liblastfm/default.nix
+++ b/pkgs/development/libraries/liblastfm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ruby, qt4, pkgconfig, libsamplerate, fftwSinglePrec }:
+{ stdenv, fetchurl, ruby, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which }:
 
 let version = "0.3.3"; in
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   prefixKey = "--prefix ";
   propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ];
-  buildNativeInputs = [ ruby pkgconfig ];
+  buildNativeInputs = [ ruby pkgconfig which ];
 
   configureFlags = "--release";
 
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 85c2fa13a93a..38eb344621e8 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -4,11 +4,11 @@ assert zlib != null;
 
 # If you want to upgrade libpng, look at libpng15 branch
 stdenv.mkDerivation rec {
-  name = "libpng-1.2.46";
+  name = "libpng-1.2.47";
   
   src = fetchurl {
     url = "mirror://sourceforge/libpng/${name}.tar.xz";
-    sha256 = "0rcx4v4khdkrvz7b02fmx7lab2pk1lal4dhx9widv36b7g2xvwzn";
+    sha256 = "1lai3dnzw81y40jr17bdj1qh08hwv9mc1v74yybl7jdx2hiilsvx";
   };
   
   propagatedBuildInputs = [ zlib ];
diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 93ed2869d0e9..83b921dd49b9 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -11,10 +11,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake fftw fftwSinglePrec libtiff libpng libjpeg python boost
     numpy hdf5 ];
 
-  cmakeFlags = if (stdenv.system == "x86_64-linux") then
-      "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC"
-    else
-      "";
+  preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\"";
+  cmakeFlags = stdenv.lib.optionals (stdenv.system == "x86_64-linux")
+      [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];
 
   meta = {
     description = "Novel computer vision C++ library with customizable algorithms and data structures";