Revert "opencolorio: combine dev and out outputs of expat when building"

This reverts commit 7d82e18159.
This commit is contained in:
Dmitry Kalinkin 2021-07-03 17:53:26 -04:00
parent 392bca4c58
commit 74af05601c
No known key found for this signature in database
GPG key ID: 5157B3EC8B2CA333

View file

@ -1,5 +1,5 @@
{
stdenv, lib, fetchFromGitHub, symlinkJoin,
stdenv, lib, fetchFromGitHub,
cmake, expat, libyamlcpp, ilmbase, pystring, # Base dependencies
glew, freeglut, # Only required on Linux
@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
sha256 = "194j9jp5c8ws0fryiz936wyinphnpzwpqnzvw9ryx6rbiwrba487";
};
nativeBuildInputs = [ cmake (symlinkJoin { name = "expat"; paths = [ expat.out expat.dev ]; }) ];
buildInputs = [ expat.out libyamlcpp ilmbase pystring ]
nativeBuildInputs = [ cmake ];
buildInputs = [ expat libyamlcpp ilmbase pystring ]
++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon GLUT Cocoa ]
++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 ]