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
This commit is contained in:
@@ -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\"" +
|
||||
|
||||
Reference in New Issue
Block a user