diff options
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/autopanosiftc/default.nix | 21 | ||||
-rw-r--r-- | pkgs/applications/graphics/freepv/default.nix | 20 | ||||
-rw-r--r-- | pkgs/applications/graphics/hugin/default.nix | 26 | ||||
-rw-r--r-- | pkgs/applications/graphics/paraview/default.nix | 32 | ||||
-rw-r--r-- | pkgs/applications/graphics/paraview/include-qobject.patch | 38 |
5 files changed, 9 insertions, 128 deletions
diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix index 424d8dcaf97b..a27d982ce8b2 100644 --- a/pkgs/applications/graphics/autopanosiftc/default.nix +++ b/pkgs/applications/graphics/autopanosiftc/default.nix @@ -10,27 +10,6 @@ stdenv.mkDerivation { buildInputs = [ cmake libpng libtiff libjpeg panotools libxml2 ]; - # 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\"" + - " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib" + - " -lpng12 -lpano13 -ljpeg -ltiff -lz -lxml2 \"" + - " -DCMAKE_SKIP_BUILD_RPATH=ON" + - " -DCMAKE_BUILD_TYPE=Release" + - " -DCMAKE_INSTALL_PREFIX=$out"; - - dontUseCmakeConfigure = true; - - # I rewrote the configure phase to get the $out references evaluated in - # cmakeFlags - configurePhase = '' - set -x - mkdir -p build; - cd build - eval -- "cmake .. $cmakeFlags" - set +x - ''; - meta = { homepage = http://hugin.sourceforge.net/; description = "Implementation in C of the autopano-sift algorithm for automatically stitching panoramas"; diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index 1e414faf2f0c..e042b15855c8 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -17,26 +17,6 @@ stdenv.mkDerivation { sed -i -e '/mozilla/d' src/CMakeLists.txt ''; - # 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_EXE_LINKER_FLAGS=\"" + - " -lpng12 -lXxf86vm -ljpeg -lz -lglut -lGLU -lxml2 -lX11\"" + - " -DCMAKE_SKIP_BUILD_RPATH=ON" + - " -DCMAKE_BUILD_TYPE=Release" + - " -DCMAKE_INSTALL_PREFIX=$out"; - - dontUseCmakeConfigure = true; - - # I rewrote the configure phase to get the $out references evaluated in - # cmakeFlags - configurePhase = '' - set -x - mkdir -p build; - cd build - eval -- "cmake .. $cmakeFlags" - set +x - ''; - meta = { description = "Open source panorama viewer using GL"; homepage = http://freepv.sourceforge.net/; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 134c6ae49d4e..9097a5d25a5e 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -15,29 +15,9 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-lrt"; - # 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\"" + - " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib" + - " -lpng12 -lpano13 -lImath -lIlmImf -lIex -lHalf -lIlmThread" + - " -ljpeg -ltiff -lz -lexiv2 -lboost_thread\"" + - " -DCMAKE_SKIP_BUILD_RPATH=ON" + - " -DCMAKE_BUILD_TYPE=Release" + - " -DCMAKE_INSTALL_PREFIX=$out"; - - buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig exiv2 gettext ilmbase ]; - - dontUseCmakeConfigure = true; - - # I rewrote the configure phase to get the $out references evaluated in - # cmakeFlags - configurePhase = '' - set -x - mkdir -p build; - cd build - eval -- "cmake .. $cmakeFlags" - set +x - ''; + buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig + exiv2 gettext ilmbase ]; + postInstall = '' ensureDir "$out/nix-support" echo "${enblendenfuse} ${autopanosiftc}" > $out/nix-support/propagated-user-env-packages diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 452b889566e7..6b74a58ef9f3 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,35 +1,15 @@ { fetchurl, stdenv, cmake, qt4 }: stdenv.mkDerivation { - name = "paraview-3.4.0"; + name = "paraview-3.6.1"; src = fetchurl { - url = http://www.paraview.org/files/v3.4/paraview-3.4.0.tar.gz; - sha256 = "27544f442e957e9aa60b32c674f2dcd84fffeecc9a40071ef6e305333413187d"; + url = http://www.paraview.org/files/v3.6/paraview-3.6.1.tar.gz; + sha256 = "1dh0dqbdvjagy122nbwr1gg03ck2if2aqqbvzcpkx38sz12cjh7h"; }; - 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\"" + - " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib/paraview-3.4" + - " -lpng12 -lSM -lICE -lXrender -lXrandr -lXcursor -lXinerama" + - " -lXfixes -lfreetype -lfontconfig -lXext -lX11 -lssl -lXt -lz\"" + - " -DCMAKE_SKIP_BUILD_RPATH=ON" + - " -DCMAKE_BUILD_TYPE=Release" + - " -DCMAKE_INSTALL_PREFIX=$out"; - - dontUseCmakeConfigure = true; - - # I rewrote the configure phase to get the $out references evaluated in - # cmakeFlags - configurePhase = '' - set -x - mkdir -p build; - cd build - eval -- "cmake .. $cmakeFlags" - set +x - ''; + preConfigure = '' + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/paraview-3.6" + ''; buildInputs = [ cmake qt4 ]; diff --git a/pkgs/applications/graphics/paraview/include-qobject.patch b/pkgs/applications/graphics/paraview/include-qobject.patch deleted file mode 100644 index bdb95c752e41..000000000000 --- a/pkgs/applications/graphics/paraview/include-qobject.patch +++ /dev/null @@ -1,38 +0,0 @@ -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; |