BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pbrt: 2017-01-12 -> 2018-08-15; cmake 3.12 compatibility (#45863)

Browse source
This commit is contained in:
Andrew Childs 2018-08-31 23:18:05 +09:00 committed by xeji
parent 98787edf30
commit 78d842e8fb
2 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/applications/graphics/pbrt/default.nix
View file

@ -2,17 +2,22 @@
stdenv.mkDerivation rec {
version = "2017-01-12";
version = "2018-08-15";
name = "pbrt-v3-${version}";
src = fetchFromGitHub {
rev = "35b6da3429526f2026fe5e5ebaf36d593e113028";
rev = "86b5821308088deea70b207bc8c22219d0103d65";
owner = "mmp";
repo = "pbrt-v3";
sha256 = "10lvbph13p6ilzqb8sgrvn9gg1zmi8wpy3hhjbqp8dnsa4x0mhj7";
sha256 = "0f7ivsczba6zfk5f0bba1js6dcwf6w6jrkiby147qp1sx5k35cv8";
fetchSubmodules = true;
};
patches = [
# https://github.com/mmp/pbrt-v3/issues/196
./openexr-cmake-3.12.patch
];
buildInputs = [ git flex bison cmake zlib ];
meta = with stdenv.lib; {

26
pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch Normal file
View file

@ -0,0 +1,26 @@
diff -ur a/src/ext/openexr/CMakeLists.txt b/src/ext/openexr/CMakeLists.txt
--- a/src/ext/openexr/CMakeLists.txt 1970-01-01 09:00:01.000000000 +0900
+++ b/src/ext/openexr/CMakeLists.txt 2018-08-31 21:44:56.490714484 +0900
@@ -26,22 +26,4 @@
${CMAKE_CURRENT_BINARY_DIR}/IlmBase/config
)
-add_custom_target(CopyIlmBaseLibs
- COMMAND ${CMAKE_COMMAND} -E copy_directory
- ${CMAKE_CURRENT_BINARY_DIR}/IlmBase/Half/$<CONFIGURATION>
- ${CMAKE_CURRENT_BINARY_DIR}/OpenEXR/IlmImf/$<CONFIGURATION>
- COMMAND ${CMAKE_COMMAND} -E copy_directory
- ${CMAKE_CURRENT_BINARY_DIR}/IlmBase/IlmThread/$<CONFIGURATION>
- ${CMAKE_CURRENT_BINARY_DIR}/OpenEXR/IlmImf/$<CONFIGURATION>
- COMMAND ${CMAKE_COMMAND} -E copy_directory
- ${CMAKE_CURRENT_BINARY_DIR}/IlmBase/Iex/$<CONFIGURATION>
- ${CMAKE_CURRENT_BINARY_DIR}/OpenEXR/IlmImf/$<CONFIGURATION>
- COMMAND ${CMAKE_COMMAND} -E copy_directory
- ${CMAKE_CURRENT_BINARY_DIR}/IlmBase/Imath/$<CONFIGURATION>
- ${CMAKE_CURRENT_BINARY_DIR}/OpenEXR/IlmImf/$<CONFIGURATION>
-)
-add_dependencies(CopyIlmBaseLibs Iex Imath IlmThread Half)
-
add_subdirectory(OpenEXR OpenEXR)
-add_dependencies(b44ExpLogTable CopyIlmBaseLibs)
-add_dependencies(dwaLookups CopyIlmBaseLibs)