I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
I updated gstreamer too, because this phonon was not finding a header file. As that
did not fix much the phonon build, I helped the generic builder with NIX_CFLAGS_COMPILER for
phonon to find the proper header files. Either the phonon cmake scripts don't find properly
the gstreamer plugins header file, or we install gstreamer in a strange way.
svn path=/nixpkgs/trunk/; revision=19974
I updated cmake to use CMAKE_PREFIX_PATH instead of CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH.
There were some expressions in kde that required CMAKE_PREFIX_PATH, and now they are not anymore
a special case.
I updated most kde-4.4 files to point to kde-4.4.0 sources instead of 4.3.4 .
svn path=/nixpkgs/trunk/; revision=19965
I patched properly their own copy of cmake findqt4 module, the same way as we had to
do in the cmake expression.
The findqt4 patch we have is already filled in the cmake buglist, but it seems it is
still not solved in in cmake 2.8.0
svn path=/nixpkgs/trunk/; revision=19960
