Unverified Commit dd443d2d authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #314050 from SuperSandro2000/prosody-config 

 prosody: point prosodyctl by default to correct directories, remove wrapper
parents f25aab11 59530dbd

pkgs/servers/xmpp/prosody/default.nix

+6 −2
Original line number Diff line number Diff line
@@ -64,13 +64,17 @@ stdenv.mkDerivation rec { 
    make -C tools/migration

  '';



  buildFlags = [

    # don't search for configs in the nix store when running prosodyctl

    "INSTALLEDCONFIG=/etc/prosody"

    "INSTALLEDDATA=/var/lib/prosody"

  ];



  # the wrapping should go away once lua hook is fixed

  postInstall = ''

      ${concatMapStringsSep "\n" (module: ''

        cp -r $communityModules/mod_${module} $out/lib/prosody/modules/

      '') (lib.lists.unique(nixosModuleDeps ++ withCommunityModules ++ withOnlyInstalledCommunityModules))}

      wrapProgram $out/bin/prosodyctl \

        --add-flags '--config "/etc/prosody/prosody.cfg.lua"'

      make -C tools/migration install

    '';