diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-06-03 09:19:19 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-06-03 09:19:19 +0000 |
| commit | 94d2e57c62ad2c1904fd696ec57dcff2c502e7f4 (patch) | |
| tree | 47f14604c81266f2776feb6fbae77aa2d85fae1f /pkgs/applications/graphics/paraview | |
| parent | 107d41f96c26200edbec5b2234d80a052bdc9af7 (diff) | |
| download | nixpkgs-94d2e57c62ad2c1904fd696ec57dcff2c502e7f4.tar nixpkgs-94d2e57c62ad2c1904fd696ec57dcff2c502e7f4.tar.gz nixpkgs-94d2e57c62ad2c1904fd696ec57dcff2c502e7f4.tar.bz2 nixpkgs-94d2e57c62ad2c1904fd696ec57dcff2c502e7f4.tar.lz nixpkgs-94d2e57c62ad2c1904fd696ec57dcff2c502e7f4.tar.xz nixpkgs-94d2e57c62ad2c1904fd696ec57dcff2c502e7f4.tar.zst nixpkgs-94d2e57c62ad2c1904fd696ec57dcff2c502e7f4.zip | |
Trying to fix the cmake-qt problems, fixing cmake's FindQt4. Paraview now builds beyond 25%, while
before it didn't. Through this commit I expect the build farm to try to build kde, and see whether this way it builds without the unusual NIX_CFLAGS_COMPILE set in the qt setup-hook. svn path=/nixpkgs/trunk/; revision=15838
Diffstat (limited to 'pkgs/applications/graphics/paraview')
| -rw-r--r-- | pkgs/applications/graphics/paraview/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/graphics/paraview/include-qobject.patch | 38 |
2 files changed, 40 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 0ecb7289f71..a2dfaabe86d 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -7,6 +7,8 @@ stdenv.mkDerivation { sha256 = "27544f442e957e9aa60b32c674f2dcd84fffeecc9a40071ef6e305333413187d"; }; + patches = [ ./include-qobject.patch ]; + # I added these flags to get all the rpaths right, which I guess they are # taken from the qt4 sources. Not very nice. cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib/paraview-3.4\"" + diff --git a/pkgs/applications/graphics/paraview/include-qobject.patch b/pkgs/applications/graphics/paraview/include-qobject.patch new file mode 100644 index 00000000000..bdb95c752e4 --- /dev/null +++ b/pkgs/applications/graphics/paraview/include-qobject.patch @@ -0,0 +1,38 @@ +diff --git a/VTK/GUISupport/Qt/CMakeLists.txt b/VTK/GUISupport/Qt/CMakeLists.txt +index 2c35be7..866f1aa 100644 +--- a/VTK/GUISupport/Qt/CMakeLists.txt ++++ b/VTK/GUISupport/Qt/CMakeLists.txt +@@ -166,6 +166,7 @@ IF(DESIRED_QT_VERSION MATCHES 4) + ) + ENDIF(QT_QTGUI_LIBRARY) + INCLUDE_DIRECTORIES(${QT_QTDESIGNER_INCLUDE_DIR}) ++ INCLUDE_DIRECTORIES(${QT_QTCORE_INCLUDE_DIR}) + QT4_WRAP_CPP ( PluginMocSrcs ${PluginMocHeaders} ) + ELSE(DESIRED_QT_VERSION MATCHES 4) + QT_WRAP_CPP ( QVTKWidgetPlugin PluginMocSrcs ${PluginMocHeaders} ) +diff --git a/VTK/GUISupport/Qt/vtkEventQtSlotConnect.h b/VTK/GUISupport/Qt/vtkEventQtSlotConnect.h +index 6782b90..ced3a67 100644 +--- a/VTK/GUISupport/Qt/vtkEventQtSlotConnect.h ++++ b/VTK/GUISupport/Qt/vtkEventQtSlotConnect.h +@@ -43,7 +43,7 @@ + #include "vtkObject.h" + #include "vtkCommand.h" // for event defines + #include "QVTKWin32Header.h" // for export define +-#include "qobject.h" // for version info ++#include <qobject.h> // for version info + + class QObject; + class vtkQtConnections; +diff --git a/VTK/GUISupport/Qt/vtkQtConnection.h b/VTK/GUISupport/Qt/vtkQtConnection.h +index 923ec2e..b189ddc 100644 +--- a/VTK/GUISupport/Qt/vtkQtConnection.h ++++ b/VTK/GUISupport/Qt/vtkQtConnection.h +@@ -33,7 +33,7 @@ + + #include "vtkObject.h" + #include "vtkCommand.h" // for event defines +-#include "qobject.h" ++#include <qobject.h> + + class QObject; + class vtkCallbackCommand; |