tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom
nixpkgs / pkgs / servers / monitoring / icinga2 / no-var-directories.patch
at devShellTools-shell 3.0 kB view raw
1diff --git a/icinga-app/CMakeLists.txt b/icinga-app/CMakeLists.txt 2index 1c92d8331..e77199959 100644 3--- a/icinga-app/CMakeLists.txt 4+++ b/icinga-app/CMakeLists.txt 5@@ -94,9 +94,3 @@ install( 6 TARGETS icinga-app 7 RUNTIME DESTINATION ${InstallPath} 8 ) 9- 10-if(NOT WIN32) 11- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}\")") 12- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}\")") 13- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_INITRUNDIR}\")") 14-endif() 15diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt 16index 986050017..39711c79e 100644 17--- a/lib/base/CMakeLists.txt 18+++ b/lib/base/CMakeLists.txt 19@@ -154,9 +154,4 @@ set_target_properties ( 20 FOLDER Lib 21 ) 22 23-if(NOT WIN32) 24- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_CACHEDIR}\")") 25- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}/crash\")") 26-endif() 27- 28 set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE) 29diff --git a/lib/perfdata/CMakeLists.txt b/lib/perfdata/CMakeLists.txt 30index ab963f7..3d9d506 100644 31--- a/lib/perfdata/CMakeLists.txt 32+++ b/lib/perfdata/CMakeLists.txt 33@@ -74,7 +74,4 @@ install_if_not_exists( 34 ${ICINGA2_CONFIGDIR}/features-available 35 ) 36 37-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_SPOOLDIR}/perfdata\")") 38-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_SPOOLDIR}/tmp\")") 39- 40 set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE) 41diff --git a/lib/remote/CMakeLists.txt b/lib/remote/CMakeLists.txt 42index 2271abff6..fc03b5c6b 100644 43--- a/lib/remote/CMakeLists.txt 44+++ b/lib/remote/CMakeLists.txt 45@@ -57,12 +57,3 @@ set_target_properties ( 46 remote PROPERTIES 47 FOLDER Lib 48 ) 49- 50-if(NOT WIN32) 51- #install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api\")") 52- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/log\")") 53- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones\")") 54- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones-stage\")") 55- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certs\")") 56- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certificate-requests\")") 57-endif() 58diff --git a/lib/compat/CMakeLists.txt b/lib/compat/CMakeLists.txt 59index 1438626..d882ae2 100644 60--- a/lib/compat/CMakeLists.txt 61+++ b/lib/compat/CMakeLists.txt 62@@ -55,8 +55,4 @@ install_if_not_exists( 63 ${ICINGA2_CONFIGDIR}/features-available 64 ) 65 66-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}/compat/archives\")") 67-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_SPOOLDIR}\")") 68-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_INITRUNDIR}/cmd\")") 69- 70 set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE)