Commit graph

7 commits

Author SHA1 Message Date
Lluís Batlle i Rossell 5417c720fd Merging from trunk.
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
2010-08-02 15:48:19 +00:00
Yury G. Kudryashov 74d75bdd6c phonon-4.4.2
svn path=/nixpkgs/trunk/; revision=22363
2010-06-21 19:25:20 +00:00
Yury G. Kudryashov ab6031464a Upgrade phonon to 4.4.1
svn path=/nixpkgs/trunk/; revision=21660
2010-05-08 17:03:07 +00:00
Lluís Batlle i Rossell ce46e7ff63 Found a new phonon (in 'unstable'), and I think kde-4.4 should be able to link with it.
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
2010-02-13 14:03:07 +00:00
Lluís Batlle i Rossell e0ff817c40 Big kde-related update.
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
2010-02-12 21:58:27 +00:00
Lluís Batlle i Rossell ffcac187e8 Trying to get kde-4.4 build *normally*. That is, without the hack "includeAllQtDirs".
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
2010-02-12 17:02:45 +00:00
Sander van der Burg bcb6e407ea Added my initial KDE 4.4 expression
svn path=/nixpkgs/trunk/; revision=19906
2010-02-10 15:06:50 +00:00