mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-19 18:44:13 +00:00
Merge pull request #287566 from ScatteredRay/djv-openexr
djv: Adding OpenEXR Support
This commit is contained in:
commit
2ec0c360fe
@ -17,6 +17,7 @@
|
|||||||
, libpng
|
, libpng
|
||||||
, opencolorio_1
|
, opencolorio_1
|
||||||
, freetype
|
, freetype
|
||||||
|
, openexr
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -145,11 +146,12 @@ stdenv.mkDerivation rec {
|
|||||||
ilmbase
|
ilmbase
|
||||||
glm
|
glm
|
||||||
glfw3
|
glfw3
|
||||||
zlib.dev
|
zlib
|
||||||
libpng
|
libpng
|
||||||
freetype
|
freetype
|
||||||
opencolorio_1
|
opencolorio_1
|
||||||
djv-deps
|
djv-deps
|
||||||
|
openexr
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
@ -162,6 +164,13 @@ stdenv.mkDerivation rec {
|
|||||||
sed -i cmake/Modules/FindOCIO.cmake \
|
sed -i cmake/Modules/FindOCIO.cmake \
|
||||||
-e 's/PATH_SUFFIXES static//' \
|
-e 's/PATH_SUFFIXES static//' \
|
||||||
-e '/OpenColorIO_STATIC/d'
|
-e '/OpenColorIO_STATIC/d'
|
||||||
|
|
||||||
|
# When searching for OpenEXR this looks for Iex.h, which exists in ilmbase,
|
||||||
|
# since it's a secondary inport, to find the correct OpenEXR lib, we search
|
||||||
|
# for something specifically in OpenEXR.
|
||||||
|
|
||||||
|
sed -i cmake/Modules/FindOpenEXR.cmake \
|
||||||
|
-e 's/find_path(OpenEXR_INCLUDE_DIR NAMES Iex.h PATH_SUFFIXES OpenEXR)/find_path(OpenEXR_INCLUDE_DIR NAMES ImfImage.h PATH_SUFFIXES OpenEXR)/'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# GLFW requires a working X11 session.
|
# GLFW requires a working X11 session.
|
||||||
|
Loading…
Reference in New Issue
Block a user