diff options
| author | Linus Heckemann <git@sphalerite.org> | 2021-01-08 17:09:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-08 17:09:51 +0100 |
| commit | c7e546aea1b1fd23fe6acbbeee293f312a98c3be (patch) | |
| tree | 763d648680b39eb62653f010f6fbcb1cb9eb63f9 | |
| parent | 422659123e2e709c2c0667e9eade1b97eb4d764f (diff) | |
| parent | 26dedb83988154d3f6af3bcbba1a3bb9abe770e9 (diff) | |
| download | nixpkgs-c7e546aea1b1fd23fe6acbbeee293f312a98c3be.tar nixpkgs-c7e546aea1b1fd23fe6acbbeee293f312a98c3be.tar.gz nixpkgs-c7e546aea1b1fd23fe6acbbeee293f312a98c3be.tar.bz2 nixpkgs-c7e546aea1b1fd23fe6acbbeee293f312a98c3be.tar.lz nixpkgs-c7e546aea1b1fd23fe6acbbeee293f312a98c3be.tar.xz nixpkgs-c7e546aea1b1fd23fe6acbbeee293f312a98c3be.tar.zst nixpkgs-c7e546aea1b1fd23fe6acbbeee293f312a98c3be.zip | |
Merge pull request #108748 from 3noch/eac/fix-vtk-png-aarch64
vtk: use system png on aarch
| -rw-r--r-- | pkgs/development/libraries/vtk/generic.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 7bfd8d9fcff..2cb0fe33d52 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -1,5 +1,5 @@ { majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }: -{ stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff +{ stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff , fetchpatch , enableQt ? false, wrapQtAppsHook, qtbase, qtx11extras, qttools , enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given." @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ libtiff ] + buildInputs = [ libpng libtiff ] ++ optionals enableQt [ qtbase qtx11extras qttools ] ++ optionals stdenv.isLinux [ libGLU @@ -65,6 +65,7 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" + "-DVTK_USE_SYSTEM_PNG=ON" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" "-DCMAKE_INSTALL_LIBDIR=lib" |