Merge master into staging-next

2018-11-19 09:55:32 +01:00
parent 5f575e7339 c4cad8cfa7
commit e343a85cfb
116 changed files with 2864 additions and 2274 deletions
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, guile,
-eigen3_3, libpng, python, libGLU, qt4, openexr, openimageio,
+eigen, libpng, python, libGLU, qt4, openexr, openimageio,
 opencolorio, xercesc, ilmbase, osl, seexpr
 }:

@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
    sha256 = "0m7zvfkdjfn48zzaxh2wa1bsaj4l876a05bzgmjlfq5dz3202anr";
  };
  buildInputs = [
-    cmake pkgconfig boost_static guile eigen3_3 libpng python
+    cmake pkgconfig boost_static guile eigen libpng python
    libGLU qt4 openexr openimageio opencolorio xercesc
    osl seexpr
  ];