commit ab34f8b39b85e523107db0f7ba969261d9d73d92 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/misc/zoneminder.nix

···

       262
        
                         fastcgi_pass ${fcgi.socketType}:${fcgi.socketAddress};

     

       263
        
                       }

     

       264
        
       

     

       265
       -
                       location /cache {

     

       266
        
                         alias /var/cache/${dirName};

     

       267
        
                       }

     

       268

···

       262
        
                         fastcgi_pass ${fcgi.socketType}:${fcgi.socketAddress};

     

       263
        
                       }

     

       264
        
       

     

       265
       +
                       location /cache/ {

     

       266
        
                         alias /var/cache/${dirName};

     

       267
        
                       }

     

       268

+2

pkgs/servers/zoneminder/default.nix

···

       89
        
       

     

       90
        
         patches = [

     

       91
        
           ./default-to-http-1dot1.patch

     

       0
        
       
     

       0
        
       
     

       92
        
         ];

     

       93
        
       

     

       94
        
         postPatch = ''

···

       89
        
       

     

       90
        
         patches = [

     

       91
        
           ./default-to-http-1dot1.patch

     

       92
       +
           # Explicitly link with dynamic linking library to fix build

     

       93
       +
           ./link-with-libdl.patch

     

       94
        
         ];

     

       95
        
       

     

       96
        
         postPatch = ''

+17

pkgs/servers/zoneminder/link-with-libdl.patch

···

       1
       +
       --- a/src/CMakeLists.txt

     

       2
       +
       +++ b/src/CMakeLists.txt

     

       3
       +
       @@ -20,10 +20,10 @@ add_executable(zms zms.cpp)

     

       4
       +
        include_directories(libbcrypt/include/bcrypt)

     

       5
       +
        include_directories(jwt-cpp/include/jwt-cpp)

     

       6
       +
       

     

       7
       +
       -target_link_libraries(zmc zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})

     

       8
       +
       -target_link_libraries(zma zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})

     

       9
       +
       -target_link_libraries(zmu zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})

     

       10
       +
       -target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})

     

       11
       +
       +target_link_libraries(zmc zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS})

     

       12
       +
       +target_link_libraries(zma zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS})

     

       13
       +
       +target_link_libraries(zmu zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS})

     

       14
       +
       +target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS})

     

       15
       +
       

     

       16
       +
        # Generate man files for the binaries destined for the bin folder

     

       17
       +
        FOREACH(CBINARY zma zmc zmu)