JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #167238 from alexshpilkin/pfstools

Browse Source 
pfstools: fix build of pfsglview with newer cmake
This commit is contained in:
Jan Tojnar 2022-04-28 16:16:14 +02:00 committed by GitHub
commit 47c29a2bbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/graphics/pfstools/default.nix
View File

@ -36,7 +36,7 @@ mkDerivation rec {
libGLU libGL freeglut
]) ++ lib.optional enableUnfree (opencv2.override { enableUnfree = true; });
patches = [ ./threads.patch ./pfstools.patch ./pfsalign.patch ];
patches = [ ./glut.patch ./threads.patch ./pfstools.patch ./pfsalign.patch ];
meta = with lib; {
homepage = "http://pfstools.sourceforge.net/";

12
pkgs/tools/graphics/pfstools/glut.patch Normal file
View File

@ -0,0 +1,12 @@
--- a/src/pfsglview/CMakeLists.txt 2022-04-04 23:21:11.164016369 +0300
+++ b/src/pfsglview/CMakeLists.txt 2022-04-04 23:21:32.757878750 +0300
@@ -11,8 +11,7 @@
add_executable(pfsglview pfsglview.cpp picture_io.cpp module.cpp m_histogram.cpp m_status.cpp m_on_screen_display.cpp)
-# TODO: Use ${GLUT_LIBRARY} instead.
-target_link_libraries(pfsglview ${OPENGL_LIBRARIES} ${GLUT_glut_LIBRARY} pfs)
+target_link_libraries(pfsglview ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} pfs)
install (TARGETS pfsglview DESTINATION bin)
install (FILES pfsglview.1 DESTINATION ${MAN_DIR})