diff options
| author | Yureka <yuka@yuka.dev> | 2024-01-06 02:03:07 +0100 |
|---|---|---|
| committer | Yureka <yuka@yuka.dev> | 2024-01-23 12:35:06 +0100 |
| commit | f164a1277206aeb31b6c6b870c798071d57bc38f (patch) | |
| tree | c5dec5366e77abf18ef4ed52ec0455fef846ca57 | |
| parent | b597c38884d483995710c61164ae42a42bda55c1 (diff) | |
alembic: build with openexr 3
| -rw-r--r-- | pkgs/development/libraries/alembic/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index afd0ad458bf75..6f73c47f49d1a 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openexr, hdf5-threadsafe, ilmbase }: +{ lib, stdenv, fetchFromGitHub, cmake, openexr, hdf5-threadsafe }: stdenv.mkDerivation rec { @@ -20,13 +20,7 @@ stdenv.mkDerivation rec nativeBuildInputs = [ cmake ]; - # NOTE: Alembic also support imath instead of ilmbase, but some users of Alembic (e.g. Blender) - # are incompatible with the imath version of Alembic - buildInputs = [ openexr hdf5-threadsafe ilmbase ]; - - # Downstream packages trying to use Alembic via CMake need ilmbase as well - # For some reason this won't be picked up correctly otherwise - propagatedBuildInputs = [ ilmbase ]; + buildInputs = [ openexr hdf5-threadsafe ]; # These flags along with the postPatch step ensure that all artifacts end up # in the correct output without needing to move anything diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1831316eb7244..f7857b0f587bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30350,7 +30350,9 @@ with pkgs; akira-unstable = callPackage ../applications/graphics/akira { }; - alembic = callPackage ../development/libraries/alembic { }; + alembic = callPackage ../development/libraries/alembic { + openexr = openexr_3; + }; alfaview = callPackage ../applications/networking/instant-messengers/alfaview { }; |