diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2018-08-31 23:18:05 +0900 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-31 16:18:05 +0200 |
| commit | 78d842e8fbbcfeab892a1726ef40cf8cd97cf863 (patch) | |
| tree | 4456e417716dd5f5a1aa0bc4e21798f97a85193d /pkgs/applications/graphics | |
| parent | 98787edf30015f680c54a5f23208703327d737db (diff) | |
| download | nixlib-78d842e8fbbcfeab892a1726ef40cf8cd97cf863.tar nixlib-78d842e8fbbcfeab892a1726ef40cf8cd97cf863.tar.gz nixlib-78d842e8fbbcfeab892a1726ef40cf8cd97cf863.tar.bz2 nixlib-78d842e8fbbcfeab892a1726ef40cf8cd97cf863.tar.lz nixlib-78d842e8fbbcfeab892a1726ef40cf8cd97cf863.tar.xz nixlib-78d842e8fbbcfeab892a1726ef40cf8cd97cf863.tar.zst nixlib-78d842e8fbbcfeab892a1726ef40cf8cd97cf863.zip | |
pbrt: 2017-01-12 -> 2018-08-15; cmake 3.12 compatibility (#45863)
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/pbrt/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch | 26 |
2 files changed, 34 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix index 1c582df50dea..3cc7166b4e46 100644 --- a/pkgs/applications/graphics/pbrt/default.nix +++ b/pkgs/applications/graphics/pbrt/default.nix @@ -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; { diff --git a/pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch b/pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch new file mode 100644 index 000000000000..2993922a1ecf --- /dev/null +++ b/pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch @@ -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) |