pfstools: fix build of pfsglview with newer cmake
The CMake build configuration for pfsglview used an internal variable, GLUT_glut_LIBRARY, to link with GLUT, which seems to have stopped working when CMake was bumped from 3.21 in 3.22 in nixpkgs#147818. Use the officially documented GLUT_LIBRARIES instead.
This commit is contained in:
parent
8866ccbe1f
commit
1cd122e7b6
|
@ -36,7 +36,7 @@ mkDerivation rec {
|
||||||
libGLU libGL freeglut
|
libGLU libGL freeglut
|
||||||
]) ++ lib.optional enableUnfree (opencv2.override { enableUnfree = true; });
|
]) ++ 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; {
|
meta = with lib; {
|
||||||
homepage = "http://pfstools.sourceforge.net/";
|
homepage = "http://pfstools.sourceforge.net/";
|
||||||
|
|
12
pkgs/tools/graphics/pfstools/glut.patch
Normal file
12
pkgs/tools/graphics/pfstools/glut.patch
Normal 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})
|
Loading…
Reference in a new issue