svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=32417
2012-02-20 05:30:06 +00:00
parent 1133387eb1 23856c2a40
commit d8454e538c
13 changed files with 163 additions and 51 deletions
--- a/pkgs/development/libraries/qtscriptgenerator/default.nix
+++ b/pkgs/development/libraries/qtscriptgenerator/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
  };
  buildInputs = [ qt4 ];

-  patches = [./qtscriptgenerator.gcc-4.4.patch];
+  patches = [ ./qtscriptgenerator.gcc-4.4.patch ./qt-4.8.patch ];
  
  # Why isn't the author providing proper Makefile or a CMakeLists.txt ?
  buildPhase = ''