diff options
author | Baptist BENOIST <baptist.benoist@hydrocean.fr> | 2013-10-28 09:56:19 +0100 |
---|---|---|
committer | Baptist BENOIST <baptist.benoist@hydrocean.fr> | 2013-10-28 10:00:32 +0100 |
commit | 736b295bc56199280bbe35c9822a7c473c44f909 (patch) | |
tree | 318d6e780ce08e2d3cc3bd08ab3376b6b2705ba0 /pkgs/development/libraries/vtk | |
parent | 90872e2b6cef90f3039b65367f85a9be68cab1e7 (diff) |
vtk: Use the Qt libraries as an argument instead of a boolean
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
Diffstat (limited to 'pkgs/development/libraries/vtk')
-rw-r--r-- | pkgs/development/libraries/vtk/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index e8f42e9f7f5f1..0e0625a2cbbec 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -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; |