Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 422659123e2e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c7e546aea1b1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 8, 2021

  1. vtk: use system png 

    VTK doesn't seem produce png symbols on aarch64. We could probably
figure out how to fix that but we can also just tell it to use the
libpng we already have, which already works on aarch64.
    @3noch
    3noch committed Jan 8, 2021
    Copy the full SHA
    26dedb8 View commit details

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

    vtk: use system png on aarch
    @lheckemann
    lheckemann authored Jan 8, 2021
    Copy the full SHA
    c7e546a View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 pkgs/development/libraries/vtk/generic.nix
5 changes: 3 additions & 2 deletions pkgs/development/libraries/vtk/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -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"