diff options
| author | obadz <obadz-git@obadz.com> | 2016-09-07 02:27:39 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-09-07 02:30:03 +0100 |
| commit | 39e197ab1ccad9f1b57c10afe4cfe592a9e40270 (patch) | |
| tree | ed2e7a4deceff926009ff2f7a50dbffba8a0e6cf /pkgs/servers/uhub/plugin-dir.patch | |
| parent | 1c7270f001d2f701cdbde0bbdfaaf779a3acdf6b (diff) | |
| download | nixlib-39e197ab1ccad9f1b57c10afe4cfe592a9e40270.tar nixlib-39e197ab1ccad9f1b57c10afe4cfe592a9e40270.tar.gz nixlib-39e197ab1ccad9f1b57c10afe4cfe592a9e40270.tar.bz2 nixlib-39e197ab1ccad9f1b57c10afe4cfe592a9e40270.tar.lz nixlib-39e197ab1ccad9f1b57c10afe4cfe592a9e40270.tar.xz nixlib-39e197ab1ccad9f1b57c10afe4cfe592a9e40270.tar.zst nixlib-39e197ab1ccad9f1b57c10afe4cfe592a9e40270.zip | |
uhub: 0.4.1 -> 0.5.0 (fixes build)
@ehmry: please have a look so that we can cherry-pick in release-16.09 and move forward on #18209
Diffstat (limited to 'pkgs/servers/uhub/plugin-dir.patch')
| -rw-r--r-- | pkgs/servers/uhub/plugin-dir.patch | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/servers/uhub/plugin-dir.patch b/pkgs/servers/uhub/plugin-dir.patch index 95ebfd6706ff..01cbcbb31cf3 100644 --- a/pkgs/servers/uhub/plugin-dir.patch +++ b/pkgs/servers/uhub/plugin-dir.patch @@ -1,23 +1,19 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 40e996e..d3b7e6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -185,10 +185,16 @@ else() - # add_definitions(-DDEBUG) - endif() +@@ -241,8 +241,14 @@ -+set( PLUGINS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads ) -+ if (UNIX) - install( TARGETS uhub RUNTIME DESTINATION bin ) -- install( TARGETS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads DESTINATION /usr/lib/uhub/ OPTIONAL ) + install( TARGETS uhub uhub-passwd RUNTIME DESTINATION bin ) +- install( TARGETS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_history_sqlite mod_chat_only mod_topic mod_no_guest_downloads DESTINATION /usr/lib/uhub/ OPTIONAL ) - install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION /etc/uhub OPTIONAL ) + -+ foreach( PLUGIN ${PLUGINS} ) -+ install( TARGETS ${PLUGIN} DESTINATION $ENV{${PLUGIN}} OPTIONAL ) -+ endforeach( PLUGIN ) ++ set( PLUGINS mod_example mod_welcome mod_logging mod_auth_simple mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads ) ++ ++ foreach( PLUGIN ${PLUGINS} ) ++ install( TARGETS ${PLUGIN} DESTINATION $ENV{${PLUGIN}} OPTIONAL ) ++ endforeach( PLUGIN ) + + install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION doc/ OPTIONAL ) + endif() + - if (SQLITE_SUPPORT) - install( TARGETS uhub-passwd RUNTIME DESTINATION bin ) |