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 · 2010-02-12 17:02:45 +00:00 · ffcac187e8
parent 4e0ccd63b3
commit ffcac187e8
38 changed files with 3 additions and 38 deletions
--- a/pkgs/desktops/kde-4.4/accessibility/default.nix
+++ b/pkgs/desktops/kde-4.4/accessibility/default.nix
@ -6,7 +6,6 @@ stdenv.mkDerivation {
    url = mirror://kde/stable/4.3.4/src/kdeaccessibility-4.3.4.tar.bz2;
    sha1 = "96aa150b8a5c368b6bb36476ed5fb3e3b3c30547";
  };
-  includeAllQtDirs=true;
  buildInputs = [ cmake qt4 perl alsaLib libXi libXtst kdelibs automoc4 phonon ];
  meta = {
    description = "KDE accessibility tools";
--- a/pkgs/desktops/kde-4.4/admin/default.nix
+++ b/pkgs/desktops/kde-4.4/admin/default.nix
@ -14,7 +14,6 @@ stdenv.mkDerivation {
  
  inherit system_config_printer;
  
-  includeAllQtDirs=true;
  
  CMAKE_PREFIX_PATH=kdepimlibs;
  
--- a/pkgs/desktops/kde-4.4/artwork/default.nix
+++ b/pkgs/desktops/kde-4.4/artwork/default.nix
@ -7,7 +7,6 @@ stdenv.mkDerivation {
    url = mirror://kde/stable/4.3.4/src/kdeartwork-4.3.4.tar.bz2;
    sha1 = "7a095932bad297f22b23765ce6ee17bfd2438bf2";
  };
-  includeAllQtDirs=true;
  buildInputs = [ cmake qt4 perl xscreensaver
                  kdelibs kdebase_workspace automoc4 phonon strigi eigen ];
  meta = {
--- a/pkgs/desktops/kde-4.4/base-runtime/default.nix
+++ b/pkgs/desktops/kde-4.4/base-runtime/default.nix
@ -8,7 +8,6 @@ stdenv.mkDerivation {
    sha1 = "871d23457c4a2676704722e2e3b7194d447904ee";
  };
 /*  CLUCENE_HOME=cluceneCore;*/
-  includeAllQtDirs=true;
  buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba stdenv.gcc.libc shared_mime_info
                  kdelibs automoc4 phonon strigi soprano cluceneCore ];
  meta = {
--- a/pkgs/desktops/kde-4.4/base-workspace/default.nix
+++ b/pkgs/desktops/kde-4.4/base-workspace/default.nix
@ -11,7 +11,6 @@ stdenv.mkDerivation {
    url = mirror://kde/stable/4.3.4/src/kdebase-workspace-4.3.4.tar.bz2;
    sha1 = "5b43447139d22247d5bc2deee8e3a944447f0bbf";
  };
-  includeAllQtDirs=true;
  CMAKE_PREFIX_PATH=kdepimlibs;
  inherit kdelibs_experimental;
  builder = ./builder.sh;
--- a/pkgs/desktops/kde-4.4/base/default.nix
+++ b/pkgs/desktops/kde-4.4/base/default.nix
@ -8,7 +8,6 @@ stdenv.mkDerivation {
    url = mirror://kde/stable/4.3.4/src/kdebase-4.3.4.tar.bz2;
    sha1 = "7f8637367177c93916dfc2e6a2f6323a5e91c6ce";
  };
-  includeAllQtDirs=true;
  buildInputs = [ cmake perl qt4 kdelibs pciutils stdenv.gcc.libc libraw1394
                  kdebase_workspace automoc4 phonon strigi qimageblitz soprano ];
  meta = {
--- a/pkgs/desktops/kde-4.4/bindings/default.nix
+++ b/pkgs/desktops/kde-4.4/bindings/default.nix
@ -11,7 +11,6 @@ stdenv.mkDerivation {
    sha256 = "1yn0wynnigbp288j9pqfd5cppc6mja9z9pcfz7g789pmyig42jvd";
  };
  builder = ./builder.sh;
-  includeAllQtDirs=true;
  buildInputs = [ python sip pyqt4 zlib libpng freetype fontconfig qt4
                  libSM libXrender libXrandr libXfixes libXcursor libXinerama libXext kdelibs ];
  meta = {
--- a/pkgs/desktops/kde-4.4/edu/default.nix
+++ b/pkgs/desktops/kde-4.4/edu/default.nix
@ -8,7 +8,6 @@ stdenv.mkDerivation {
    url = mirror://kde/stable/4.3.4/src/kdeedu-4.3.4.tar.bz2;
    sha1 = "ee646d57db11b761d8da33fc03c596c8f531eb9d";
  };
-  includeAllQtDirs=true;
  buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml xplanet
                  kdelibs automoc4 phonon eigen ];
  meta = {
--- a/pkgs/desktops/kde-4.4/extragear/amarok/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/amarok/default.nix
@ -7,7 +7,6 @@ stdenv.mkDerivation {
    url = mirror://kde/stable/amarok/2.2.2/src/amarok-2.2.2.tar.bz2;
    sha256 = "0kg67b9wz2wi1gyn229vzbib4s0wpgqrjyfqy0032yl9fa2k13bn";
  };
-  includeAllQtDirs=true;
  inherit mysql loudmouth;
  QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
  builder = ./builder.sh;
--- a/pkgs/desktops/kde-4.4/extragear/digikam/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/digikam/default.nix
@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
    sha256 = "13zs5gwrzmqcx29r4vn96csz5hivycczjpa5l1157f5xhcg949kd";
  };

-  includeAllQtDirs=true;
  buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
    lcms jasper libgphoto2 kdepimlibs gettext ];
  CMAKE_PREFIX_PATH = kdepimlibs;
--- a/pkgs/desktops/kde-4.4/extragear/filelight/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/filelight/default.nix
@ -7,7 +7,6 @@ stdenv.mkDerivation {
    url = http://www.kde-apps.org/CONTENT/content-files/99561-filelight-1.9rc3.tgz;
    sha256 = "0ljyx23j4cvrsi1dvmxila82q2cd26barmcvc8qmr74kz6pj78sq";
  };
-  includeAllQtDirs=true;
  buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon 
    qimageblitz ];
  meta = {
--- a/pkgs/desktops/kde-4.4/extragear/kdesvn/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/kdesvn/default.nix
@ -7,7 +7,6 @@ stdenv.mkDerivation {
    url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.4.1.tar.bz2;
    sha256 = "1xaankj3zl1wxm1zf9dayb9qwnp9s5xx964p83w7pcsir4h5959z";
  };
-  includeAllQtDirs=true;
  builder = ./builder.sh;
  inherit subversion;
  buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ];
--- a/pkgs/desktops/kde-4.4/extragear/kipi-plugins/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/kipi-plugins/default.nix
@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
    sha256 = "1fmjxl41lvyb6zv8wrg8sz0hb1jjynj2pwisynpbffglnxd09fwf";
  };

-  includeAllQtDirs=true;
  buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs 
    libxml2 libxslt gettext ];
  CMAKE_PREFIX_PATH = kdepimlibs;
--- a/pkgs/desktops/kde-4.4/extragear/kmplayer/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/kmplayer/default.nix
@ -6,7 +6,6 @@ stdenv.mkDerivation {
    url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.1b.tar.bz2;
    sha256 = "04wzxxa83kxfzpsrllbdgl0kd6jj13kzhdkm2w66s7mpylr88lfi";
  };
-  includeAllQtDirs=true;
  builder = ./builder.sh;
  buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc pango gtk dbus_glib kdelibs automoc4 phonon ];
  meta = {
--- a/pkgs/desktops/kde-4.4/extragear/koffice/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/koffice/default.nix
@ -8,7 +8,6 @@ stdenv.mkDerivation {
    url = mirror://kde/stable/koffice-2.1.0/koffice-2.1.0.tar.bz2;
    sha256 = "1jdc2rvj5xqd66d152zmjz2psq44kbraqpl0fq05yjg2wz8kdsln";
  }; 
-  includeAllQtDirs=true;
  CMAKE_PREFIX_PATH=kdepimlibs;
  buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew shared_mime_info 
                  poppler gsl gmm wv2 libwpd
--- a/pkgs/desktops/kde-4.4/extragear/konversation/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/konversation/default.nix
@ -7,7 +7,6 @@ stdenv.mkDerivation {
    url = mirror://kde/stable/konversation/1.2.1/src/konversation-1.2.1.tar.bz2;
    sha256 = "1rx4xgw14cfzkxghgn80np8i2ndq26sbdvv96g46r0s14qkdyq8w";
  };
-  includeAllQtDirs=true;
  CMAKE_PREFIX_PATH=kdepimlibs;
  buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc libXScrnSaver kdelibs kdepimlibs automoc4 phonon qca2 ];
  patchPhase = ''
--- a/pkgs/desktops/kde-4.4/extragear/krusader/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/krusader/default.nix
@ -6,7 +6,6 @@ stdenv.mkDerivation {
    url = mirror://sourceforge/krusader/krusader-2.0.0.tar.gz;
    sha256 = "dc74c47d6eaf1c28165a74750e5a1b0341fa1c0d436658d0d5f85a6149f4852c";
  };
-  includeAllQtDirs=true;
  buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon ];
  patches = [./krusader-gcc44.patch];
  meta = {
--- a/pkgs/desktops/kde-4.4/extragear/ktorrent/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/ktorrent/default.nix
@ -7,7 +7,6 @@ stdenv.mkDerivation {
    url = http://ktorrent.org/downloads/3.3.2/ktorrent-3.3.2.tar.bz2;
    sha256 = "08s67nz6wml5bx595czw2gcvrfb09hw1n1rzbj1n8iprr1abcpz1";
  };
-  includeAllQtDirs=true;
  CMAKE_PREFIX_PATH=kdepimlibs;
  cmakeFlags = "-DTASKMANAGER_INCLUDE_DIR=${kdebase_workspace}/include";
  buildInputs = [ cmake qt4 perl gmp taglib boost gettext stdenv.gcc.libc
--- a/pkgs/desktops/kde-4.4/games/default.nix
+++ b/pkgs/desktops/kde-4.4/games/default.nix
@ -6,7 +6,6 @@ stdenv.mkDerivation {
    url = mirror://kde/stable/4.3.4/src/kdegames-4.3.4.tar.bz2;
    sha1 = "33ea8ec476b1557a55c90c071bd462e5ceb7c52b";
  };
-  includeAllQtDirs=true;
  buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon qca2 ];
  meta = {
    description = "KDE Games";
--- a/pkgs/desktops/kde-4.4/graphics/default.nix
+++ b/pkgs/desktops/kde-4.4/graphics/default.nix
@ -8,7 +8,6 @@ stdenv.mkDerivation {
    url = mirror://kde/stable/4.3.4/src/kdegraphics-4.3.4.tar.bz2;
    sha1 = "bb32171b0d562d5698d4f0526be2b069e99f7448";
  };
-  includeAllQtDirs=true;
  buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre poppler chmlib
                  shared_mime_info stdenv.gcc.libc libXxf86vm
                  kdelibs automoc4 phonon strigi qimageblitz soprano qca2 ];
--- a/pkgs/desktops/kde-4.4/l10n/default.nix
+++ b/pkgs/desktops/kde-4.4/l10n/default.nix
@ -9,7 +9,6 @@ let
      url = attr.url;
      sha256 = attr.sha256;
    };
-    includeAllQtDirs=true;
    buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon ];
    cmakeFlagsArray = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
    meta = {
--- a/pkgs/desktops/kde-4.4/l10n/generate-expr-from-tarballs.pl
+++ b/pkgs/desktops/kde-4.4/l10n/generate-expr-from-tarballs.pl
@ -68,7 +68,6 @@ let
      url = attr.url;
      sha256 = attr.sha256;
    };
-    includeAllQtDirs=true;
    buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon ];
    cmakeFlagsArray = [ "-DGETTEXT_INCLUDE_DIR=\${gettext}/include" ];
    meta = {
--- a/pkgs/desktops/kde-4.4/libs/default.nix
+++ b/pkgs/desktops/kde-4.4/libs/default.nix
@ -12,7 +12,9 @@ stdenv.mkDerivation {
    sha256 = "1nf829k9mcnqf1jfsfjgb1dw6s0kh02sixxjcgmapccmmqx1p5ak";
  };
  
-  includeAllQtDirs = true;
+  # The same way as cmake needed a patch for findqt4 to work properly under nix, 
+  # also KDE, because they have their own copy of cmake's findqt4.
+  patches = [ ./findqt4.patch ];

  buildInputs = [
    cmake perl qt4 stdenv.gcc.libc xz flex bison bzip2 pcre fam libxml2 libxslt
--- a/pkgs/desktops/kde-4.4/multimedia/default.nix
+++ b/pkgs/desktops/kde-4.4/multimedia/default.nix
@ -7,7 +7,6 @@ stdenv.mkDerivation {
    url = mirror://kde/stable/4.3.4/src/kdemultimedia-4.3.4.tar.bz2;
    sha1 = "cf8f2696267ec682ee48fbb0f6171d9e9f7aa4b3";
  };
-  includeAllQtDirs=true;
  buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib cdparanoia lame
                  kdelibs kdelibs_experimental automoc4 phonon ];
  meta = {
--- a/pkgs/desktops/kde-4.4/network/default.nix
+++ b/pkgs/desktops/kde-4.4/network/default.nix
@ -9,7 +9,6 @@ stdenv.mkDerivation {
    url = mirror://kde/stable/4.3.4/src/kdenetwork-4.3.4.tar.bz2;
    sha1 = "e066c3642d254e1e8213ef511546e960c5658596";
  };
-  includeAllQtDirs=true;
  CMAKE_PREFIX_PATH=kdepimlibs;
  buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
                  libvncserver tapioca_qt libmsn
--- a/pkgs/desktops/kde-4.4/pim-runtime/default.nix
+++ b/pkgs/desktops/kde-4.4/pim-runtime/default.nix
@ -12,7 +12,6 @@ stdenv.mkDerivation {
                  kdelibs kdelibs_experimental kdepimlibs
 		  automoc4 phonon akonadi soprano strigi ];
  CMAKE_PREFIX_PATH=kdepimlibs;
-  includeAllQtDirs=true;
  builder = ./builder.sh;
  meta = {
    description = "KDE PIM runtime";
--- a/pkgs/desktops/kde-4.4/pim/default.nix
+++ b/pkgs/desktops/kde-4.4/pim/default.nix
@ -8,7 +8,6 @@ stdenv.mkDerivation {
    url = mirror://kde/stable/4.3.4/src/kdepim-4.3.4.tar.bz2;
    sha1 = "3ddc34c2b0c96c0273431631ccf47a8b9b4289b3";
  };
-  includeAllQtDirs=true;
  CMAKE_PREFIX_PATH=kdepimlibs;
  builder = ./builder.sh;  
  buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt
--- a/pkgs/desktops/kde-4.4/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4.4/pimlibs/default.nix
@ -7,7 +7,6 @@ stdenv.mkDerivation {
    url = mirror://kde/stable/4.3.4/src/kdepimlibs-4.3.4.tar.bz2;
    sha1 = "4f7cd55999e82f504e3766b6f360ae58b984d5cb";
  };
-  includeAllQtDirs=true;
  buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme stdenv.gcc.libc libical openldap shared_mime_info
                  kdelibs automoc4 phonon akonadi ];
  meta = {
--- a/pkgs/desktops/kde-4.4/plasma-addons/default.nix
+++ b/pkgs/desktops/kde-4.4/plasma-addons/default.nix
@ -10,7 +10,6 @@ stdenv.mkDerivation {
  };
  inherit kdebase_workspace;
  builder = ./builder.sh;
-  includeAllQtDirs=true;
  CMAKE_PREFIX_PATH=kdepimlibs;
  KDEDIRS="${kdeedu}";
  buildInputs = [ cmake qt4 perl python shared_mime_info
--- a/pkgs/desktops/kde-4.4/sdk/default.nix
+++ b/pkgs/desktops/kde-4.4/sdk/default.nix
@ -7,7 +7,6 @@ stdenv.mkDerivation {
    url = mirror://kde/stable/4.3.4/src/kdesdk-4.3.4.tar.bz2;
    sha1 = "42b6209908f8baadc0add46153649ebdfa9a977a";
  };
-  includeAllQtDirs=true;
  CMAKE_PREFIX_PATH=kdepimlibs;
  builder=./builder.sh;
  inherit aprutil;
--- a/pkgs/desktops/kde-4.4/support/akonadi/default.nix
+++ b/pkgs/desktops/kde-4.4/support/akonadi/default.nix
@ -6,7 +6,6 @@ stdenv.mkDerivation {
    url = http://download.akonadi-project.org/akonadi-1.3.1.tar.bz2;
    sha256 = "1pbn6sviipxxpx80cspncfc3nlz047nryfbv8xzfz5811p19k7jb";
  };
-  includeAllQtDirs=true;
  buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ];
  meta = {
    description = "KDE PIM Storage Service";
--- a/pkgs/desktops/kde-4.4/support/phonon/default.nix
+++ b/pkgs/desktops/kde-4.4/support/phonon/default.nix
@ -8,7 +8,6 @@ stdenv.mkDerivation {
    url = mirror://kde/stable/4.2.1/src/phonon-4.3.1.tar.bz2;
    sha1 = "f7537e5280d0a4cc1348975daa7a7e45d833d45c";
  };
-  includeAllQtDirs = true;
  buildInputs = [ cmake qt4 libXau libXdmcp libpthreadstubs gst_all.gstreamer gst_all.gstPluginsBase xineLib automoc4 ];
  meta = {
    description = "KDE Multimedia API";
--- a/pkgs/desktops/kde-4.4/support/polkit-qt/default.nix
+++ b/pkgs/desktops/kde-4.4/support/polkit-qt/default.nix
@ -6,7 +6,6 @@ stdenv.mkDerivation {
    url = mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-0.9.3.tar.bz2;
    sha256 = "08mz8p98nlxnxy1l751jg1010vgjq2f2d6n4cj27jvihqkpbaixn";
  };
-  includeAllQtDirs = true;
  buildInputs = [ cmake qt4 policykit automoc4 ];
  meta = {
    description = "Qt PolicyKit bindings";
--- a/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix
+++ b/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix
@ -6,7 +6,6 @@ stdenv.mkDerivation {
    url = mirror://sourceforge/qimageblitz/qimageblitz-0.0.4.tar.bz2;
    md5 = "cb87c7f1c0455e8984ee4830f1e749cf";
  };
-  includeAllQtDirs = true;
  buildInputs = [ cmake qt4 ];
  meta = {
    description = "Graphical effect and filter library for KDE4";
--- a/pkgs/desktops/kde-4.4/support/strigi/default.nix
+++ b/pkgs/desktops/kde-4.4/support/strigi/default.nix
@ -10,7 +10,6 @@ stdenv.mkDerivation rec {
    sha256 = "1cra4jlpd7cdvckwalfjrf2224qvhbkmxdd3sn02q9jhv830b0yi";
  };

-  includeAllQtDirs = true;
  
  CLUCENE_HOME = cluceneCore;
  
--- a/pkgs/desktops/kde-4.4/toys/default.nix
+++ b/pkgs/desktops/kde-4.4/toys/default.nix
@ -6,7 +6,6 @@ stdenv.mkDerivation {
    url = mirror://kde/stable/4.3.4/src/kdetoys-4.3.4.tar.bz2;
    sha1 = "96f6121990590acd3fb5b8cae25ef98b5572733c";
  };
-  includeAllQtDirs=true;
  buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon ];
  meta = {
    description = "KDE Toys";
--- a/pkgs/desktops/kde-4.4/utils/default.nix
+++ b/pkgs/desktops/kde-4.4/utils/default.nix
@ -14,7 +14,6 @@ stdenv.mkDerivation {
  
  inherit system_config_printer;
  
-  includeAllQtDirs=true;
  
  CMAKE_PREFIX_PATH=kdepimlibs;
  
--- a/pkgs/desktops/kde-4.4/webdev/default.nix
+++ b/pkgs/desktops/kde-4.4/webdev/default.nix
@ -7,7 +7,6 @@ stdenv.mkDerivation {
    url = mirror://kde/stable/4.3.4/src/kdewebdev-4.3.4.tar.bz2;
    sha1 = "697f0557c616497a6f80bbcac472ad6ddd687ae8";
  };
-  includeAllQtDirs=true;
  CMAKE_PREFIX_PATH=kdepimlibs;
  buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs automoc4 phonon ];
  meta = {