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.
main
Alexander Shpilkin 2 years ago
parent 8866ccbe1f
commit 1cd122e7b6
No known key found for this signature in database
GPG Key ID: 55F6F5B75637BD38
  1. 2
      pkgs/tools/graphics/pfstools/default.nix
  2. 12
      pkgs/tools/graphics/pfstools/glut.patch

@ -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/";

@ -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…
Cancel
Save