From bcd4d4151383e74d9174c5fc1e0465e9cfd104a2 Mon Sep 17 00:00:00 2001 From: Tony Olagbaiye Date: Wed, 13 May 2020 18:44:13 +0100 Subject: [PATCH] nix: update build and remove rocksdb --- default.nix | 304 ++++++++++++++++++++++++++-------------------------- 1 file changed, 154 insertions(+), 150 deletions(-) diff --git a/default.nix b/default.nix index 6e494adfa..7c2831ed4 100644 --- a/default.nix +++ b/default.nix @@ -36,14 +36,11 @@ let buildFarmFrom = basename: root: pkgs.linkFarm (lib.strings.sanitizeDerivationName basename) (buildFarm root); in buildFarmFrom "construct" repo; - rocksdb-pinned = pkgs.rocksdb.overrideAttrs (super: rec { - version = "5.16.6"; - src = pkgs.fetchFromGitHub { - owner = "facebook"; repo = "rocksdb"; rev = "v${version}"; - sha256 = "0yy09myzbi99qdmh2c2mxlddr12pwxzh66ym1y6raaqglrsmax66"; - }; - NIX_CFLAGS_COMPILE = "${super.NIX_CFLAGS_COMPILE} -Wno-error=redundant-move"; - }); + buildArgs = buildInputs: nativeBuildInputs: { + inherit buildInputs nativeBuildInputs; + preferLocalBuild = true; + allowSubstitutes = false; + }; VERSION_COMMIT_CMD = "git rev-parse --short HEAD"; VERSION_BRANCH_CMD = "git rev-parse --abbrev-ref HEAD"; @@ -66,7 +63,7 @@ in stdenv.mkDerivation rec { libtool makeWrapper ] ++ lib.optional useClang llvmPackages_latest.llvm; buildInputs = with pkgs; [ - libsodium openssl file boost gmp zlib jemalloc rocksdb-pinned + libsodium openssl file boost gmp zlib jemalloc rocksdb ] ++ lib.optional withGraphicsMagick graphicsmagick; includes = stdenv.mkDerivation rec { @@ -517,56 +514,58 @@ in stdenv.mkDerivation rec { }; installPhase = let - ircdUnitCXX = ccFile: loFile: extraArgs: "${pkgs.runCommandCC (lib.strings.sanitizeDerivationName loFile) { inherit buildInputs nativeBuildInputs; } '' + ircdUnitCXX = ccFile: loFile: extraArgs: "${pkgs.runCommandCC (lib.strings.sanitizeDerivationName loFile) (buildArgs buildInputs nativeBuildInputs) '' libtool --tag=CXX --mode=compile $CXX -std=gnu++17 -DHAVE_CONFIG_H -DIRCD_UNIT ${extraArgs} \ -I${includes} -include ircd/ircd.pic.h -DPCH -DNDEBUG ${WARNOPTS} -ftls-model=initial-exec -pthread ${CXXOPTS} \ -c -o $out/${loFile} ${source}/ircd/${ccFile} ''}/${loFile}"; - ircdUnitCC = asFile: loFile: extraArgs: "${pkgs.runCommandCC (lib.strings.sanitizeDerivationName loFile) { inherit buildInputs nativeBuildInputs; } '' + ircdUnitCC = asFile: loFile: extraArgs: "${pkgs.runCommandCC (lib.strings.sanitizeDerivationName loFile) (buildArgs buildInputs nativeBuildInputs) '' libtool --tag=CC --mode=compile $CC -DHAVE_CONFIG_H -DIRCD_UNIT ${extraArgs} \ -I${includes} -DPCH -DNDEBUG ${WARNOPTS} \ -c -o $out/${loFile} ${source}/ircd/${asFile} ''}/${loFile}"; - ircdLD = loFiles: laFile: extraArgs: "${pkgs.runCommandCC (lib.strings.sanitizeDerivationName laFile) { inherit buildInputs nativeBuildInputs; } '' + ircdLD = loFiles: laFile: extraArgs: "${pkgs.runCommandCC (lib.strings.sanitizeDerivationName laFile) (buildArgs buildInputs nativeBuildInputs) '' libtool --tag=CXX --mode=link g++ -std=gnu++17 -ftls-model=initial-exec -pthread ${CXXOPTS} -version-info 3:2:0 \ - -Wl,--no-undefined-version -Wl,--weak-unresolved-symbols -Wl,--unresolved-symbols=ignore-in-shared-libs -Wl,-z,nodelete -Wl,-z,nodlopen -Wl,-z,lazy -L${pkgs.boost.out}/lib \ + -Wl,--no-undefined-version -Wl,--weak-unresolved-symbols -Wl,--unresolved-symbols=ignore-in-shared-libs \ + -Wl,--wrap=pthread_create -Wl,--wrap=pthread_join -Wl,--wrap=pthread_timedjoin_np -Wl,--wrap=pthread_self -Wl,--wrap=pthread_setname_np \ + -Wl,-z,nodelete -Wl,-z,nodlopen -Wl,-z,lazy -L${boost.out}/lib \ -Wl,-fuse-ld=gold -Wl,--gdb-index -Wl,--warn-common -Wl,--warn-execstack -Wl,--detect-odr-violations -Wl,--rosegment -Wl,-z,noexecstack -Wl,-z,combreloc -Wl,-z,text-unlikely-segment \ -o $out/${laFile} ${lib.concatStringsSep " " loFiles} ${extraArgs} \ - -lrocksdb -lboost_coroutine -lboost_context -lboost_thread -lboost_filesystem -lboost_chrono -lboost_system -lssl -lcrypto -L${pkgs.libsodium.out}/lib -lsodium -lmagic -lz -lpthread -latomic -lrocksdb -ldl + -lrocksdb -lboost_coroutine -lboost_context -lboost_thread -lboost_filesystem -lboost_chrono -lboost_system -lssl -lcrypto -L${pkgs.libsodium.out}/lib -lsodium -lmagic -lz -lpthread -latomic -lrocksdb -ldl ''}/${laFile}"; - matrixUnitCXX = ccFile: loFile: extraArgs: "${pkgs.runCommandCC (lib.strings.sanitizeDerivationName loFile) { inherit buildInputs nativeBuildInputs; } '' + matrixUnitCXX = ccFile: loFile: extraArgs: "${pkgs.runCommandCC (lib.strings.sanitizeDerivationName loFile) (buildArgs buildInputs nativeBuildInputs) '' libtool --tag=CXX --mode=compile $CXX -std=gnu++17 -DHAVE_CONFIG_H -DIRCD_UNIT -DIRCD_MATRIX_UNIT ${extraArgs} \ -I${includes} -include ircd/matrix.pic.h -include ircd/mods/mapi.h -DPCH -DNDEBUG ${WARNOPTS} -ftls-model=local-dynamic -pthread ${CXXOPTS} \ -c -o $out/${loFile} ${source}/matrix/${ccFile} ''}/${loFile}"; - matrixLD = loFiles: laFile: extraArgs: "${pkgs.runCommandCC (lib.strings.sanitizeDerivationName laFile) { inherit buildInputs nativeBuildInputs; } '' + matrixLD = loFiles: laFile: extraArgs: "${pkgs.runCommandCC (lib.strings.sanitizeDerivationName laFile) (buildArgs buildInputs nativeBuildInputs) '' libtool --tag=CXX --mode=link g++ -std=gnu++17 -pthread -ftls-model=local-dynamic ${CXXOPTS} -version-info 0:1:0 \ -Wl,--no-undefined-version -Wl,--allow-shlib-undefined -Wl,--unresolved-symbols=ignore-in-shared-libs -Wl,-z,lazy -L${dirOf ircd}/ \ -Wl,-fuse-ld=gold -Wl,--gdb-index -Wl,--warn-common -Wl,--warn-execstack -Wl,--detect-odr-violations -Wl,--rosegment -Wl,-z,noexecstack -Wl,-z,combreloc -Wl,-z,text-unlikely-segment \ -o $out/${laFile} ${lib.concatStringsSep " " loFiles} ${extraArgs} -lrocksdb -ldl ${if useJemalloc then "-ljemalloc" else ""} ''}/${laFile}"; - moduleUnitCXX = subdir: ccFile: loFile: extraArgs: "${pkgs.runCommandCC (lib.strings.sanitizeDerivationName loFile) { inherit buildInputs nativeBuildInputs; } '' + moduleUnitCXX = subdir: ccFile: loFile: extraArgs: "${pkgs.runCommandCC (lib.strings.sanitizeDerivationName loFile) (buildArgs buildInputs nativeBuildInputs) '' libtool --tag=CXX --mode=compile $CXX -std=gnu++17 -DHAVE_CONFIG_H -DIRCD_UNIT -DIRCD_UNIT_MODULE ${extraArgs} \ -I${includes} -include ${includes}/ircd/matrix.pic.h -include ${includes}/ircd/mods/mapi.h -DPCH -DNDEBUG ${WARNOPTS} -ftls-model=global-dynamic -pthread ${CXXOPTS} \ -I ${source}/modules/${lib.concatStringsSep "/" subdir} -c -o $out/${loFile} ${source}/modules/${lib.concatStringsSep "/" subdir}/${ccFile} ''}/${loFile}"; - moduleLD = loFiles: laFile: extraArgs: "${pkgs.runCommandCC (lib.strings.sanitizeDerivationName laFile) { inherit buildInputs nativeBuildInputs; } '' + moduleLD = loFiles: laFile: extraArgs: "${pkgs.runCommandCC (lib.strings.sanitizeDerivationName laFile) (buildArgs buildInputs nativeBuildInputs) '' libtool --tag=CXX --mode=link $CXX -std=gnu++17 -ftls-model=global-dynamic -pthread ${CXXOPTS} -module -avoid-version \ -Wl,--allow-shlib-undefined -Wl,-z,lazy -L${dirOf ircd}/ -L${dirOf matrix}/ \ -Wl,-fuse-ld=gold -Wl,--gdb-index -Wl,--warn-common -Wl,--warn-execstack -Wl,--detect-odr-violations -Wl,--rosegment -Wl,-z,noexecstack -Wl,-z,combreloc -Wl,-z,text-unlikely-segment \ -o $out/${laFile} ${lib.concatStringsSep " " loFiles} -lrocksdb -ldl ${extraArgs} ''}/${laFile}"; - constructUnitCXX = ccFile: obFile: extraArgs: "${pkgs.runCommandCC (lib.strings.sanitizeDerivationName obFile) { inherit buildInputs nativeBuildInputs; } '' + constructUnitCXX = ccFile: obFile: extraArgs: "${pkgs.runCommandCC (lib.strings.sanitizeDerivationName obFile) (buildArgs buildInputs nativeBuildInputs) '' mkdir -p $out $CXX -std=gnu++17 -DHAVE_CONFIG_H -I${includes} -I${pkgs.boost.dev}/include -DPCH -DNDEBUG ${WARNOPTS} -ftls-model=initial-exec -pthread ${CXXOPTS} \ -c -o $out/${obFile} ${source}/construct/${ccFile} ${extraArgs} ''}/${obFile}"; - constructLD = obFiles: exFile: "${pkgs.runCommandCC (lib.strings.sanitizeDerivationName exFile) { inherit buildInputs nativeBuildInputs; } '' + constructLD = obFiles: exFile: "${pkgs.runCommandCC (lib.strings.sanitizeDerivationName exFile) (buildArgs buildInputs nativeBuildInputs) '' libtool --tag=CXX --mode=link g++ -std=gnu++17 -ftls-model=initial-exec -pthread ${CXXOPTS} -dlopen self \ -Wl,--warn-execstack -Wl,--warn-common -Wl,--detect-odr-violations -Wl,--unresolved-symbols=report-all -Wl,--allow-shlib-undefined -Wl,--dynamic-list-data -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo -Wl,--rosegment -Wl,-z,noexecstack \ -L${dirOf ircd}/ ${lib.concatMapStringsSep " " (mod: "-L${dirOf mod}/") modules} -L${pkgs.boost.out}/lib \ -Wl,-fuse-ld=gold -Wl,--gdb-index -Wl,--warn-common -Wl,--warn-execstack -Wl,--detect-odr-violations -Wl,--rosegment -Wl,-z,noexecstack -Wl,-z,combreloc -Wl,-z,text-unlikely-segment \ - -o $out/bin/${exFile} ${lib.concatStringsSep " " obFiles} -lircd -lboost_coroutine -lboost_context -lboost_thread -lboost_filesystem -lboost_chrono -lboost_system -lssl -lcrypto -lpthread -latomic -lrocksdb -ldl + -o $out/bin/${exFile} ${lib.concatStringsSep " " obFiles} -lircd -lboost_coroutine -lboost_context -lboost_thread -lboost_filesystem -lboost_chrono -lboost_system -lssl -lcrypto -lpthread -latomic -lrocksdb -ldl ''}/bin/${exFile}"; versionDefs = let @@ -625,13 +624,13 @@ in stdenv.mkDerivation rec { "${ircdUnitCXX "ctx.cc" "ctx.lo" "-I${boost.dev}/include -include ircd/asio.h"}" "${ircdUnitCXX "ctx_eh.cc" "ctx_eh.lo" "-I${boost.dev}/include -include ircd/asio.h"}" "${ircdUnitCXX "ctx_ole.cc" "ctx_ole.lo" "-I${boost.dev}/include -include ircd/asio.h"}" + "${ircdUnitCXX "ctx_posix.cc" "ctx_posix.lo" "-I${boost.dev}/include -include ircd/asio.h"}" "${ircdUnitCXX "fs_aio.cc" "fs_aio.lo" "-I${boost.dev}/include -include ircd/asio.h"}" "${ircdUnitCXX "fs_iou.cc" "fs_iou.lo" "-I${boost.dev}/include -include ircd/asio.h"}" "${ircdUnitCXX "mods.cc" "mods.lo" "-I${boost.dev}/include -include ircd/asio.h"}" "${ircdUnitCXX "mods_ldso.cc" "mods_ldso.lo" ""}" - "${ircdUnitCXX "db_write_thread.cc" "db_write_thread.lo" "-I${rocksdb-pinned.out}/include"}" - "${ircdUnitCXX "db_crc32.cc" "db_crc32.lo" "-I${rocksdb-pinned.out}/include"}" "${ircdUnitCXX "db_port.cc" "db_port.lo" ""}" + "${ircdUnitCXX "db_fixes.cc" "db_fixes.lo" "-I${rocksdb.src} -I${rocksdb.out}/include"}" "${ircdUnitCXX "db_env.cc" "db_env.lo" ""}" "${ircdUnitCXX "db.cc" "db.lo" ""}" "${ircdUnitCXX "net.cc" "net.lo" "-I${boost.dev}/include -include ircd/asio.h"}" @@ -645,7 +644,6 @@ in stdenv.mkDerivation rec { "${ircdUnitCXX "server.cc" "server.lo" "-I${boost.dev}/include -include ircd/asio.h"}" "${ircdUnitCXX "client.cc" "client.lo" "-I${boost.dev}/include -include ircd/asio.h"}" "${ircdUnitCXX "resource.cc" "resource.lo" ""}" - # js.cc would go here "${ircdUnitCXX "ircd.cc" "ircd.lo" "${versionDefs}"}" ] "libircd.la" "-rpath $out/lib"; @@ -756,181 +754,187 @@ in stdenv.mkDerivation rec { modules = with pkgs; [ (moduleLD [ "${moduleUnitCXX [] "m_breadcrumb_rooms.cc" "m_breadcrumb_rooms.lo" ""}" - ] "m_breadcrumb_rooms.la" "-rpath $out/lib/modules") + ] "m_breadcrumb_rooms.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_bridge.cc" "m_bridge.lo" ""}" - ] "m_bridge.la" "-rpath $out/lib/modules") + ] "m_bridge.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_command.cc" "m_command.lo" ""}" - ] "m_command.la" "-rpath $out/lib/modules") + ] "m_command.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_control.cc" "m_control.lo" ""}" - ] "m_control.la" "-rpath $out/lib/modules") + ] "m_control.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_device.cc" "m_device.lo" ""}" - ] "m_device.la" "-rpath $out/lib/modules") + ] "m_device.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_device_list_update.cc" "m_device_list_update.lo" ""}" - ] "m_device_list_update.la" "-rpath $out/lib/modules") + ] "m_device_list_update.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_direct.cc" "m_direct.lo" ""}" - ] "m_direct.la" "-rpath $out/lib/modules") + ] "m_direct.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_direct_to_device.cc" "m_direct_to_device.lo" ""}" - ] "m_direct_to_device.la" "-rpath $out/lib/modules") + ] "m_direct_to_device.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_ignored_user_list.cc" "m_ignored_user_list.lo" ""}" - ] "m_ignored_user_list.la" "-rpath $out/lib/modules") + ] "m_ignored_user_list.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_listen.cc" "m_listen.lo" ""}" - ] "m_listen.la" "-rpath $out/lib/modules") + ] "m_listen.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_noop.cc" "m_noop.lo" ""}" - ] "m_noop.la" "-rpath $out/lib/modules") + ] "m_noop.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_presence.cc" "m_presence.lo" ""}" - ] "m_presence.la" "-rpath $out/lib/modules") + ] "m_presence.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_profile.cc" "m_profile.lo" ""}" - ] "m_profile.la" "-rpath $out/lib/modules") + ] "m_profile.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_push.cc" "m_push.lo" ""}" - ] "m_push.la" "-rpath $out/lib/modules") + ] "m_push.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_receipt.cc" "m_receipt.lo" ""}" - ] "m_receipt.la" "-rpath $out/lib/modules") + ] "m_receipt.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_relation.cc" "m_relation.lo" ""}" - ] "m_relation.la" "-rpath $out/lib/modules") + ] "m_relation.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_room_aliases.cc" "m_room_aliases.lo" ""}" - ] "m_room_aliases.la" "-rpath $out/lib/modules") + ] "m_room_aliases.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_room_canonical_alias.cc" "m_room_canonical_alias.lo" ""}" - ] "m_room_canonical_alias.la" "-rpath $out/lib/modules") + ] "m_room_canonical_alias.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_room_create.cc" "m_room_create.lo" ""}" - ] "m_room_create.la" "-rpath $out/lib/modules") + ] "m_room_create.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_room_history_visibility.cc" "m_room_history_visibility.lo" ""}" - ] "m_room_history_visibility.la" "-rpath $out/lib/modules") + ] "m_room_history_visibility.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_room_join_rules.cc" "m_room_join_rules.lo" ""}" - ] "m_room_join_rules.la" "-rpath $out/lib/modules") + ] "m_room_join_rules.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_room_member.cc" "m_room_member.lo" ""}" - ] "m_room_member.la" "-rpath $out/lib/modules") + ] "m_room_member.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_room_message.cc" "m_room_message.lo" ""}" - ] "m_room_message.la" "-rpath $out/lib/modules") + ] "m_room_message.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_room_name.cc" "m_room_name.lo" ""}" - ] "m_room_name.la" "-rpath $out/lib/modules") + ] "m_room_name.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_room_power_levels.cc" "m_room_power_levels.lo" ""}" - ] "m_room_power_levels.la" "-rpath $out/lib/modules") + ] "m_room_power_levels.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_room_redaction.cc" "m_room_redaction.lo" ""}" - ] "m_room_redaction.la" "-rpath $out/lib/modules") + ] "m_room_redaction.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_room_server_acl.cc" "m_room_server_acl.lo" ""}" - ] "m_room_server_acl.la" "-rpath $out/lib/modules") + ] "m_room_server_acl.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_room_third_party_invite.cc" "m_room_third_party_invite.lo" ""}" - ] "m_room_third_party_invite.la" "-rpath $out/lib/modules") + ] "m_room_third_party_invite.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "m_vm_fetch.cc" "m_vm_fetch.lo" ""}" - ] "m_vm_fetch.la" "-rpath $out/lib/modules") + ] "m_vm_fetch.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "net_dns_cache.cc" "net_dns_cache.lo" ""}" - ] "net_dns_cache.la" "-rpath $out/lib/modules") + ] "net_dns_cache.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "stats.cc" "stats.lo" ""}" - ] "stats.la" "-rpath $out/lib/modules") + ] "stats.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "console.cc" "console.lo" "${versionDefs}"}" - ] "console.la" "-rpath $out/lib/modules") + ] "console.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "web_root.cc" "web_root.lo" ""}" - ] "web_root.la" "-rpath $out/lib/modules") + ] "web_root.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "web_hook.cc" "web_hook.lo" ""}" - ] "web_hook.la" "-rpath $out/lib/modules") + ] "web_hook.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "well_known.cc" "well_known.lo" ""}" - ] "well_known.la" "-rpath $out/lib/modules") + ] "well_known.la" "-rpath $out/lib/modules") + (moduleLD [ + "${moduleUnitCXX [ "admin" ] "users.cc" "users.lo" ""}" + ] "admin_users.la" "-rpath $out/lib/modules") + (moduleLD [ + "${moduleUnitCXX [ "admin" ] "deactivate.cc" "deactivate.lo" ""}" + ] "admin_deactivate.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "versions.cc" "versions.lo" ""}" - ] "client/client_versions.la" "-rpath $out/lib/modules") + ] "client_versions.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "events.cc" "events.lo" ""}" - ] "client/client_events.la" "-rpath $out/lib/modules") + ] "client_events.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "login.cc" "login.lo" ""}" - ] "client/client_login.la" "-rpath $out/lib/modules") + ] "client_login.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "logout.cc" "logout.lo" ""}" - ] "client/client_logout.la" "-rpath $out/lib/modules") + ] "client_logout.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "sync.cc" "sync.lo" ""}" - ] "client/client_sync.la" "-rpath $out/lib/modules") + ] "client_sync.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "presence.cc" "presence.lo" ""}" - ] "client/client_presence.la" "-rpath $out/lib/modules") + ] "client_presence.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "profile.cc" "profile.lo" ""}" - ] "client/client_profile.la" "-rpath $out/lib/modules") + ] "client_profile.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "devices.cc" "devices.lo" ""}" - ] "client/client_devices.la" "-rpath $out/lib/modules") + ] "client_devices.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "pushers.cc" "pushers.lo" ""}" - ] "client/client_pushers.la" "-rpath $out/lib/modules") + ] "client_pushers.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "publicrooms.cc" "publicrooms.lo" ""}" - ] "client/client_publicrooms.la" "-rpath $out/lib/modules") + ] "client_publicrooms.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "createroom.cc" "createroom.lo" ""}" - ] "client/client_createroom.la" "-rpath $out/lib/modules") + ] "client_createroom.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "pushrules.cc" "pushrules.lo" ""}" - ] "client/client_pushrules.la" "-rpath $out/lib/modules") + ] "client_pushrules.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "join.cc" "join.lo" ""}" - ] "client/client_join.la" "-rpath $out/lib/modules") + ] "client_join.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "publicised_groups.cc" "publicised_groups.lo" ""}" - ] "client/client_publicised_groups.la" "-rpath $out/lib/modules") + ] "client_publicised_groups.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "initialsync.cc" "initialsync.lo" ""}" - ] "client/client_initialsync.la" "-rpath $out/lib/modules") + ] "client_initialsync.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "search.cc" "search.lo" ""}" - ] "client/client_search.la" "-rpath $out/lib/modules") + ] "client_search.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "joined_groups.cc" "joined_groups.lo" ""}" - ] "client/client_joined_groups.la" "-rpath $out/lib/modules") + ] "client_joined_groups.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "register_available.cc" "register_available.lo" ""}" - ] "client/client_register_available.la" "-rpath $out/lib/modules") + ] "client_register_available.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "capabilities.cc" "capabilities.lo" ""}" - ] "client/client_capabilities.la" "-rpath $out/lib/modules") + ] "client_capabilities.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "send_to_device.cc" "send_to_device.lo" ""}" - ] "client/client_send_to_device.la" "-rpath $out/lib/modules") + ] "client_send_to_device.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "delete_devices.cc" "delete_devices.lo" ""}" - ] "client/client_delete_devices.la" "-rpath $out/lib/modules") + ] "client_delete_devices.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "notifications.cc" "notifications.lo" ""}" - ] "client/client_notifications.la" "-rpath $out/lib/modules") + ] "client_notifications.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "register_email.cc" "register_email.lo" ""}" - ] "client/client_register_email.la" "-rpath $out/lib/modules") + ] "client_register_email.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" ] "register.cc" "register.lo" ""}" - ] "client/client_register.la" "-rpath $out/lib/modules") + ] "client_register.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "rooms" ] "messages.cc" "messages.lo" ""}" "${moduleUnitCXX [ "client" "rooms" ] "state.cc" "state.lo" ""}" @@ -954,189 +958,189 @@ in stdenv.mkDerivation rec { "${moduleUnitCXX [ "client" "rooms" ] "relations.cc" "relations.lo" ""}" "${moduleUnitCXX [ "client" "rooms" ] "upgrade.cc" "upgrade.lo" ""}" "${moduleUnitCXX [ "client" "rooms" ] "rooms.cc" "rooms.lo" ""}" - ] "client/client_rooms.la" "-rpath $out/lib/modules") + ] "client_rooms.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "user" ] "openid.cc" "openid.lo" ""}" "${moduleUnitCXX [ "client" "user" ] "filter.cc" "filter.lo" ""}" "${moduleUnitCXX [ "client" "user" ] "account_data.cc" "account_data.lo" ""}" "${moduleUnitCXX [ "client" "user" ] "rooms.cc" "rooms.lo" ""}" "${moduleUnitCXX [ "client" "user" ] "user.cc" "user.lo" ""}" - ] "client/client_user.la" "-rpath $out/lib/modules") + ] "client_user.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "directory" ] "room.cc" "room.lo" ""}" - ] "client/client_directory_room.la" "-rpath $out/lib/modules") - (moduleLD [ + ] "client_directory_room.la" "-rpath $out/lib/modules") + (moduleLD [ "${moduleUnitCXX [ "client" "directory" ] "user.cc" "user.lo" ""}" - ] "client/client_directory_user.la" "-rpath $out/lib/modules") - (moduleLD [ + ] "client_directory_user.la" "-rpath $out/lib/modules") + (moduleLD [ "${moduleUnitCXX [ "client" "directory" "list" ] "room.cc" "room.lo" ""}" - ] "client/client_directory_list_room.la" "-rpath $out/lib/modules") - (moduleLD [ + ] "client_directory_list_room.la" "-rpath $out/lib/modules") + (moduleLD [ "${moduleUnitCXX [ "client" "directory" "list" ] "appservice.cc" "appservice.lo" ""}" - ] "client/client_directory_list_appservice.la" "-rpath $out/lib/modules") - (moduleLD [ + ] "client_directory_list_appservice.la" "-rpath $out/lib/modules") + (moduleLD [ "${moduleUnitCXX [ "client" "voip" ] "turnserver.cc" "turnserver.lo" ""}" - ] "client/client_voip_turnserver.la" "-rpath $out/lib/modules") - (moduleLD [ + ] "client_voip_turnserver.la" "-rpath $out/lib/modules") + (moduleLD [ "${moduleUnitCXX [ "client" "thirdparty" ] "protocols.cc" "protocols.lo" ""}" - ] "client/client_thirdparty_protocols.la" "-rpath $out/lib/modules") - (moduleLD [ + ] "client_thirdparty_protocols.la" "-rpath $out/lib/modules") + (moduleLD [ "${moduleUnitCXX [ "client" "sync" ] "account_data.cc" "account_data.lo" ""}" - ] "client/client_sync_account_data.la" "-rpath $out/lib/modules") - (moduleLD [ + ] "client_sync_account_data.la" "-rpath $out/lib/modules") + (moduleLD [ "${moduleUnitCXX [ "client" "sync" ] "presence.cc" "presence.lo" ""}" - ] "client/client_sync_presence.la" "-rpath $out/lib/modules") + ] "client_sync_presence.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "sync" ] "rooms.cc" "rooms.lo" ""}" - ] "client/client_sync_rooms.la" "-rpath $out/lib/modules") + ] "client_sync_rooms.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "sync" ] "to_device.cc" "to_device.lo" ""}" - ] "client/client_sync_to_device.la" "-rpath $out/lib/modules") + ] "client_sync_to_device.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "sync" ] "device_lists.cc" "device_lists.lo" ""}" - ] "client/client_sync_device_lists.la" "-rpath $out/lib/modules") + ] "client_sync_device_lists.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "sync" ] "device_one_time_keys_count.cc" "device_one_time_keys_count.lo" ""}" - ] "client/client_sync_device_one_time_keys_count.la" "-rpath $out/lib/modules") + ] "client_sync_device_one_time_keys_count.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "sync" "rooms" ] "account_data.cc" "account_data.lo" ""}" - ] "client/client_sync_rooms_account_data.la" "-rpath $out/lib/modules") + ] "client_sync_rooms_account_data.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "sync" "rooms" ] "ephemeral.cc" "ephemeral.lo" ""}" - ] "client/client_sync_rooms_ephemeral.la" "-rpath $out/lib/modules") + ] "client_sync_rooms_ephemeral.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "sync" "rooms" ] "state.cc" "state.lo" ""}" - ] "client/client_sync_rooms_state.la" "-rpath $out/lib/modules") + ] "client_sync_rooms_state.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "sync" "rooms" ] "timeline.cc" "timeline.lo" ""}" - ] "client/client_sync_rooms_timeline.la" "-rpath $out/lib/modules") + ] "client_sync_rooms_timeline.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "sync" "rooms" ] "unread_notifications.cc" "unread_notifications.lo" ""}" - ] "client/client_sync_rooms_unread_notifications.la" "-rpath $out/lib/modules") + ] "client_sync_rooms_unread_notifications.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "sync" "rooms" ] "summary.cc" "summary.lo" ""}" - ] "client/client_sync_rooms_summary.la" "-rpath $out/lib/modules") + ] "client_sync_rooms_summary.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "sync" "rooms" ] "ephemeral/receipt.cc" "ephemeral/receipt.lo" ""}" - ] "client/client_sync_rooms_ephemeral_receipt.la" "-rpath $out/lib/modules") + ] "client_sync_rooms_ephemeral_receipt.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "sync" "rooms" ] "ephemeral/typing.cc" "ephemeral/typing.lo" ""}" - ] "client/client_sync_rooms_ephemeral_typing.la" "-rpath $out/lib/modules") + ] "client_sync_rooms_ephemeral_typing.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "keys" ] "upload.cc" "upload.lo" ""}" - ] "client/client_keys_upload.la" "-rpath $out/lib/modules") + ] "client_keys_upload.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "keys" ] "query.cc" "query.lo" ""}" - ] "client/client_keys_query.la" "-rpath $out/lib/modules") + ] "client_keys_query.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "keys" ] "claim.cc" "claim.lo" ""}" - ] "client/client_keys_claim.la" "-rpath $out/lib/modules") + ] "client_keys_claim.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "keys" ] "changes.cc" "changes.lo" ""}" - ] "client/client_keys_changes.la" "-rpath $out/lib/modules") + ] "client_keys_changes.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "keys" ] "signatures/upload.cc" "signatures/upload.lo" ""}" - ] "client/client_keys_signatures_upload.la" "-rpath $out/lib/modules") + ] "client_keys_signatures_upload.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "keys" ] "device_signing/upload.cc" "device_signing/upload.lo" ""}" - ] "client/client_keys_device_signing_upload.la" "-rpath $out/lib/modules") + ] "client_keys_device_signing_upload.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "room_keys" ] "version.cc" "version.lo" ""}" - ] "client/client_room_keys_version.la" "-rpath $out/lib/modules") + ] "client_room_keys_version.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "room_keys" ] "keys.cc" "keys.lo" ""}" - ] "client/client_room_keys_keys.la" "-rpath $out/lib/modules") + ] "client_room_keys_keys.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "client" "account" ] "3pid.cc" "3pid.lo" ""}" "${moduleUnitCXX [ "client" "account" ] "whoami.cc" "whoami.lo" ""}" "${moduleUnitCXX [ "client" "account" ] "password.cc" "password.lo" ""}" "${moduleUnitCXX [ "client" "account" ] "deactivate.cc" "deactivate.lo" ""}" "${moduleUnitCXX [ "client" "account" ] "account.cc" "account.lo" ""}" - ] "client/client_account.la" "-rpath $out/lib/modules") + ] "client_account.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "send.cc" "send.lo" ""}" - ] "federation/federation_send.la" "-rpath $out/lib/modules") + ] "federation_send.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "event.cc" "event.lo" ""}" - ] "federation/federation_event.la" "-rpath $out/lib/modules") + ] "federation_event.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "get_missing_events.cc" "get_missing_events.lo" ""}" - ] "federation/federation_get_missing_events.la" "-rpath $out/lib/modules") + ] "federation_get_missing_events.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "get_groups_publicised.cc" "get_groups_publicised.lo" ""}" - ] "federation/federation_get_groups_publicised.la" "-rpath $out/lib/modules") + ] "federation_get_groups_publicised.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "version.cc" "version.lo" ""}" - ] "federation/federation_version.la" "-rpath $out/lib/modules") + ] "federation_version.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "sender.cc" "sender.lo" ""}" - ] "federation/federation_sender.la" "-rpath $out/lib/modules") + ] "federation_sender.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "query.cc" "query.lo" ""}" - ] "federation/federation_query.la" "-rpath $out/lib/modules") + ] "federation_query.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "invite.cc" "invite.lo" ""}" - ] "federation/federation_invite.la" "-rpath $out/lib/modules") + ] "federation_invite.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "invite2.cc" "invite2.lo" ""}" - ] "federation/federation_invite2.la" "-rpath $out/lib/modules") + ] "federation_invite2.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "make_join.cc" "make_join.lo" ""}" - ] "federation/federation_make_join.la" "-rpath $out/lib/modules") + ] "federation_make_join.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "send_join.cc" "send_join.lo" ""}" - ] "federation/federation_send_join.la" "-rpath $out/lib/modules") + ] "federation_send_join.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "state_ids.cc" "state_ids.lo" ""}" - ] "federation/federation_state_ids.la" "-rpath $out/lib/modules") + ] "federation_state_ids.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "state.cc" "state.lo" ""}" - ] "federation/federation_state.la" "-rpath $out/lib/modules") + ] "federation_state.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "make_leave.cc" "make_leave.lo" ""}" - ] "federation/federation_make_leave.la" "-rpath $out/lib/modules") + ] "federation_make_leave.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "send_leave.cc" "send_leave.lo" ""}" - ] "federation/federation_send_leave.la" "-rpath $out/lib/modules") + ] "federation_send_leave.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "backfill.cc" "backfill.lo" ""}" - ] "federation/federation_backfill.la" "-rpath $out/lib/modules") + ] "federation_backfill.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "backfill_ids.cc" "backfill_ids.lo" ""}" - ] "federation/federation_backfill_ids.la" "-rpath $out/lib/modules") + ] "federation_backfill_ids.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "event_auth.cc" "event_auth.lo" ""}" - ] "federation/federation_event_auth.la" "-rpath $out/lib/modules") + ] "federation_event_auth.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "query_auth.cc" "query_auth.lo" ""}" - ] "federation/federation_query_auth.la" "-rpath $out/lib/modules") + ] "federation_query_auth.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "publicrooms.cc" "publicrooms.lo" ""}" - ] "federation/federation_publicrooms.la" "-rpath $out/lib/modules") + ] "federation_publicrooms.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "user_devices.cc" "user_devices.lo" ""}" - ] "federation/federation_user_devices.la" "-rpath $out/lib/modules") + ] "federation_user_devices.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "user_keys_query.cc" "user_keys_query.lo" ""}" - ] "federation/federation_user_keys_query.la" "-rpath $out/lib/modules") + ] "federation_user_keys_query.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "user_keys_claim.cc" "user_keys_claim.lo" ""}" - ] "federation/federation_user_keys_claim.la" "-rpath $out/lib/modules") + ] "federation_user_keys_claim.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "federation" ] "rooms.cc" "rooms.lo" ""}" - ] "federation/federation_rooms.la" "-rpath $out/lib/modules") + ] "federation_rooms.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "identity" ] "v1.cc" "v1.lo" ""}" - ] "identity/identity_v1.la" "-rpath $out/lib/modules") + ] "identity_v1.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "identity" ] "pubkey.cc" "pubkey.lo" ""}" - ] "identity/identity_pubkey.la" "-rpath $out/lib/modules") + ] "identity_pubkey.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "key" ] "server.cc" "server.lo" ""}" - ] "key/key_server.la" "-rpath $out/lib/modules") + ] "key_server.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "key" ] "query.cc" "query.lo" ""}" - ] "key/key_query.la" "-rpath $out/lib/modules") + ] "key_query.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [ "media" ] "download.cc" "download.lo" ""}" "${moduleUnitCXX [ "media" ] "upload.cc" "upload.lo" ""}" @@ -1144,7 +1148,7 @@ in stdenv.mkDerivation rec { "${moduleUnitCXX [ "media" ] "preview_url.cc" "preview_url.lo" ""}" "${moduleUnitCXX [ "media" ] "config.cc" "config.lo" ""}" "${moduleUnitCXX [ "media" ] "media.cc" "media.lo" ""}" - ] "media/media_media.la" "-rpath $out/lib/modules") + ] "media_media.la" "-rpath $out/lib/modules") (moduleLD [ "${moduleUnitCXX [] "magick.cc" "magick_la-magick.lo" "-I${graphicsmagick.out}/include/GraphicsMagick"}" ] "magick.la" "-rpath $out/lib/modules -lGraphicsMagick++ -lGraphicsMagickWand -lGraphicsMagick")