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

Merge pull request #108748 from 3noch/eac/fix-vtk-png-aarch64

Browse Source 
vtk: use system png on aarch
This commit is contained in:
Linus Heckemann 2021-01-08 17:09:51 +01:00 committed by GitHub
commit c7e546aea1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/vtk/generic.nix
View File

@ -1,5 +1,5 @@
{ majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }: { 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 , fetchpatch
, enableQt ? false, wrapQtAppsHook, qtbase, qtx11extras, qttools , enableQt ? false, wrapQtAppsHook, qtbase, qtx11extras, qttools
, enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given." , enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given."
@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ libtiff ] buildInputs = [ libpng libtiff ]
++ optionals enableQt [ qtbase qtx11extras qttools ] ++ optionals enableQt [ qtbase qtx11extras qttools ]
++ optionals stdenv.isLinux [ ++ optionals stdenv.isLinux [
libGLU libGLU
@ -65,6 +65,7 @@ in stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC"
"-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC"
"-DVTK_USE_SYSTEM_PNG=ON"
"-DVTK_USE_SYSTEM_TIFF=1" "-DVTK_USE_SYSTEM_TIFF=1"
"-DOPENGL_INCLUDE_DIR=${libGL}/include" "-DOPENGL_INCLUDE_DIR=${libGL}/include"
"-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_LIBDIR=lib"