commit 1cd122e7b6e404dbda80704774ad1d180f02cde6 · pyrox.dev/nixpkgs

+1 -1

pkgs/tools/graphics/pfstools/default.nix

···

       36
        
           libGLU libGL freeglut

     

       37
        
         ]) ++ lib.optional enableUnfree (opencv2.override { enableUnfree = true; });

     

       38
        
       

     

       39
       -
         patches = [ ./threads.patch ./pfstools.patch ./pfsalign.patch ];

     

       40
        
       

     

       41
        
         meta = with lib; {

     

       42
        
           homepage = "http://pfstools.sourceforge.net/";

···

       36
        
           libGLU libGL freeglut

     

       37
        
         ]) ++ lib.optional enableUnfree (opencv2.override { enableUnfree = true; });

     

       38
        
       

     

       39
       +
         patches = [ ./glut.patch ./threads.patch ./pfstools.patch ./pfsalign.patch ];

     

       40
        
       

     

       41
        
         meta = with lib; {

     

       42
        
           homepage = "http://pfstools.sourceforge.net/";

+12

pkgs/tools/graphics/pfstools/glut.patch

···

       1
       +
       --- a/src/pfsglview/CMakeLists.txt	2022-04-04 23:21:11.164016369 +0300

     

       2
       +
       +++ b/src/pfsglview/CMakeLists.txt	2022-04-04 23:21:32.757878750 +0300

     

       3
       +
       @@ -11,8 +11,7 @@

     

       4
       +
        

     

       5
       +
        add_executable(pfsglview pfsglview.cpp picture_io.cpp module.cpp m_histogram.cpp m_status.cpp m_on_screen_display.cpp)

     

       6
       +
        

     

       7
       +
       -# TODO: Use ${GLUT_LIBRARY} instead.

     

       8
       +
       -target_link_libraries(pfsglview ${OPENGL_LIBRARIES} ${GLUT_glut_LIBRARY} pfs)

     

       9
       +
       +target_link_libraries(pfsglview ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} pfs)

     

       10
       +
        

     

       11
       +
        install (TARGETS pfsglview DESTINATION bin)

     

       12
       +
        install (FILES pfsglview.1 DESTINATION ${MAN_DIR})