git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108748 from 3noch/eac/fix-vtk-png-aarch64

vtk: use system png on aarch

commitc7e546aea1b1fd23fe6acbbeee293f312a98c3be authorLinus Heckemann <git@sphalerite.org> dateFri 8 Jan 2021, 17:09 (6 years ago) parent422659126dedb8
1 file changed+3−2
pkgs/development/libraries/vtk/generic.nix+3−2
pkgs/development/libraries/vtk/generic.nix+3−2
@@ -1,5 +1,5 @@
11{ majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }:
2−{ stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff
2+{ stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff
33, fetchpatch
44, enableQt ? false, wrapQtAppsHook, qtbase, qtx11extras, qttools
55, enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given."
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
2424
2525 nativeBuildInputs = [ cmake ];
2626
27− buildInputs = [ libtiff ]
27+ buildInputs = [ libpng libtiff ]
2828 ++ optionals enableQt [ qtbase qtx11extras qttools ]
2929 ++ optionals stdenv.isLinux [
3030 libGLU
@@ -65,6 +65,7 @@ in stdenv.mkDerivation rec {
6565 cmakeFlags = [
6666 "-DCMAKE_C_FLAGS=-fPIC"
6767 "-DCMAKE_CXX_FLAGS=-fPIC"
68+ "-DVTK_USE_SYSTEM_PNG=ON"
6869 "-DVTK_USE_SYSTEM_TIFF=1"
6970 "-DOPENGL_INCLUDE_DIR=${libGL}/include"
7071 "-DCMAKE_INSTALL_LIBDIR=lib"