pyrox.dev
pbrt: 2017-01-12 -> 2018-08-15; cmake 3.12 compatibility (#45863)
authored by
Andrew Childs
and committed by
xeji
78d842e8
98787edf
+8
-3
pkgs/applications/graphics/pbrt/default.nix
+8
-3
pkgs/applications/graphics/pbrt/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
5
-
version = "2017-01-12";
5
+
version = "2018-08-15";
6
6
name = "pbrt-v3-${version}";
7
7
8
8
src = fetchFromGitHub {
9
-
rev = "35b6da3429526f2026fe5e5ebaf36d593e113028";
9
+
rev = "86b5821308088deea70b207bc8c22219d0103d65";
10
10
owner = "mmp";
11
11
repo = "pbrt-v3";
12
-
sha256 = "10lvbph13p6ilzqb8sgrvn9gg1zmi8wpy3hhjbqp8dnsa4x0mhj7";
12
+
sha256 = "0f7ivsczba6zfk5f0bba1js6dcwf6w6jrkiby147qp1sx5k35cv8";
13
13
fetchSubmodules = true;
14
14
};
15
+
16
+
patches = [
17
+
# https://github.com/mmp/pbrt-v3/issues/196
18
+
./openexr-cmake-3.12.patch
19
+
];
15
20
16
21
buildInputs = [ git flex bison cmake zlib ];
17
22
+26
pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch
+26
pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch
···
1
+
diff -ur a/src/ext/openexr/CMakeLists.txt b/src/ext/openexr/CMakeLists.txt
2
+
--- a/src/ext/openexr/CMakeLists.txt 1970-01-01 09:00:01.000000000 +0900
3
+
+++ b/src/ext/openexr/CMakeLists.txt 2018-08-31 21:44:56.490714484 +0900
4
+
@@ -26,22 +26,4 @@
5
+
${CMAKE_CURRENT_BINARY_DIR}/IlmBase/config
6
+
)
7
+
8
+
-add_custom_target(CopyIlmBaseLibs
9
+
- COMMAND ${CMAKE_COMMAND} -E copy_directory
10
+
- ${CMAKE_CURRENT_BINARY_DIR}/IlmBase/Half/$<CONFIGURATION>
11
+
- ${CMAKE_CURRENT_BINARY_DIR}/OpenEXR/IlmImf/$<CONFIGURATION>
12
+
- COMMAND ${CMAKE_COMMAND} -E copy_directory
13
+
- ${CMAKE_CURRENT_BINARY_DIR}/IlmBase/IlmThread/$<CONFIGURATION>
14
+
- ${CMAKE_CURRENT_BINARY_DIR}/OpenEXR/IlmImf/$<CONFIGURATION>
15
+
- COMMAND ${CMAKE_COMMAND} -E copy_directory
16
+
- ${CMAKE_CURRENT_BINARY_DIR}/IlmBase/Iex/$<CONFIGURATION>
17
+
- ${CMAKE_CURRENT_BINARY_DIR}/OpenEXR/IlmImf/$<CONFIGURATION>
18
+
- COMMAND ${CMAKE_COMMAND} -E copy_directory
19
+
- ${CMAKE_CURRENT_BINARY_DIR}/IlmBase/Imath/$<CONFIGURATION>
20
+
- ${CMAKE_CURRENT_BINARY_DIR}/OpenEXR/IlmImf/$<CONFIGURATION>
21
+
-)
22
+
-add_dependencies(CopyIlmBaseLibs Iex Imath IlmThread Half)
23
+
-
24
+
add_subdirectory(OpenEXR OpenEXR)
25
+
-add_dependencies(b44ExpLogTable CopyIlmBaseLibs)
26
+
-add_dependencies(dwaLookups CopyIlmBaseLibs)