jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vtk: Use the Qt libraries as an argument instead of a boolean

Browse Source 
To prevent multiple Qt libraries when developing with a custom one, the Qt
support can now be activated by directly supplying the Qt libraries as an
argument (qtLib).

qtSDK and qtFull users/developers now just have to define an override such
as the following one in order to use it inside their development
environment:

vtk.override { qtLib = qt4SDK; };

The previous behavior is still the same for vtk and vtkWithQt4 end-users.

Change-Id: I517762d4ff7de46d32cc46e6e725fd62737caa52
This commit is contained in:
Baptist BENOIST 2013-10-28 09:56:19 +01:00
parent 90872e2b6c
commit 736b295bc5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/vtk/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, mesa, libX11, xproto, libXt
, useQt4 ? false, qt4 }:
, qtLib ? null }:
with stdenv.lib;
@ -11,22 +11,22 @@ let
in
stdenv.mkDerivation rec {
name = "vtk-${os useQt4 "qvtk-"}${version}";
name = "vtk-${os (qtLib != null) "qvtk-"}${version}";
src = fetchurl {
url = "${meta.homepage}files/release/${majorVersion}/vtk-${version}.tar.gz";
md5 = "a0363f78910f466ba8f1bd5ab5437cb9";
};
buildInputs = [ cmake mesa libX11 xproto libXt ]
++ optional useQt4 qt4;
++ optional (qtLib != null) qtLib;
# Shared libraries don't work, because of rpath troubles with the current
# nixpkgs camke approach. It wants to call a binary at build time, just
# built and requiring one of the shared objects.
# At least, we use -fPIC for other packages to be able to use this in shared
# objects.
cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ] ++ optional useQt4
[ "-DVTK_USE_QT:BOOL=ON" ];
cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ]
++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ];
enableParallelBuilding = true;

2
pkgs/top-level/all-packages.nix
View File

@ -5731,7 +5731,7 @@ let
vtk = callPackage ../development/libraries/vtk { };
vtkWithQt4 = vtk.override { useQt4 = true; };
vtkWithQt4 = vtk.override { qtLib = qt4; };
vxl = callPackage ../development/libraries/vxl {
libpng = libpng12;