svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/libpng15/; revision=31386

1 files changed, 5 insertions, 4 deletions

diff --git a/pkgs/development/libraries/attica/default.nix b/pkgs/development/libraries/attica/default.nix
index 95de0834f292..6d53ff303beb 100644
--- a/pkgs/development/libraries/attica/default.nix
+++ b/pkgs/development/libraries/attica/default.nix
@@ -1,19 +1,20 @@
 { stdenv, fetchurl, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "attica-0.2.0";
+  name = "attica-0.3.0";
   
   src = fetchurl {
     url = "mirror://kde/stable/attica/${name}.tar.bz2";
-    sha256 = "0g2la91fgdr185ah15vc91plvdwvbm6kpsyz0vk0da7ggiyg3y9a";
+    sha256 = "1wfd37mvskn77ppzjdh3x6cb5p9na81ibh05ardfvbwqqn523gd0";
   };
   
-  buildInputs = [ cmake qt4 ];
+  buildInputs = [ qt4 ];
+  buildNativeInputs = [ cmake ];
   
   meta = with stdenv.lib; {
     description = "A library to access Open Collaboration Service providers";
     license = "LGPL";
     maintainers = [ maintainers.sander maintainers.urkud ];
-    platforms = qt4.meta.platforms;
+    inherit (qt4.meta) platforms;
   };
 }