Merge pull request #22 from unmojang/evan-goode/nix-sync

nix: sync changes from nixpkgs

launcher/Application.cpp

@@ -960,8 +960,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
                     [[fallthrough]];
                 default: {
                     qDebug() << "Exiting because update lockfile is present";
-                    QMetaObject::invokeMethod(
+                    QMetaObject::invokeMethod(this, []() { exit(1); }, Qt::QueuedConnection);
-                        this, []() { exit(1); }, Qt::QueuedConnection);
                     return;
                 }
             }
@@ -993,8 +992,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
                     [[fallthrough]];
                 default: {
                     qDebug() << "Exiting because update lockfile is present";
-                    QMetaObject::invokeMethod(
+                    QMetaObject::invokeMethod(this, []() { exit(1); }, Qt::QueuedConnection);
-                        this, []() { exit(1); }, Qt::QueuedConnection);
                     return;
                 }
             }
@@ -1707,8 +1705,7 @@ QString Application::getJarPath(QString jarFile)
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
         FS::PathCombine(m_rootPath, "share", BuildConfig.LAUNCHER_NAME),
 #endif
-        FS::PathCombine(m_rootPath, "jars"),
+        FS::PathCombine(m_rootPath, "jars"), FS::PathCombine(applicationDirPath(), "jars"),
-        FS::PathCombine(applicationDirPath(), "jars"),
         FS::PathCombine(applicationDirPath(), "..", "jars")  // from inside build dir, for debuging
     };
     for (QString p : potentialPaths) {

launcher/BaseInstaller.h

@@ -29,7 +29,7 @@ class BaseVersion;
 class BaseInstaller {
    public:
     BaseInstaller();
-    virtual ~BaseInstaller(){};
+    virtual ~BaseInstaller() {};
     bool isApplied(MinecraftInstance* on);
 
     virtual bool add(MinecraftInstance* to);

launcher/CreateAuthlibInjectorAccount.h

@@ -31,7 +31,7 @@ class CreateAuthlibInjectorAccount : public NetAction {
     }
     MinecraftAccountPtr getAccount();
 
-    void init() override{};
+    void init() override {};
 
    protected slots:
     void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) override {}

launcher/InstancePageProvider.h

@@ -22,7 +22,7 @@ class InstancePageProvider : protected QObject, public BasePageProvider {
    public:
     explicit InstancePageProvider(InstancePtr parent) { inst = parent; }
 
-    virtual ~InstancePageProvider(){};
+    virtual ~InstancePageProvider() {};
     virtual QList<BasePage*> getPages() override
     {
         QList<BasePage*> values;

launcher/JavaCommon.h

@@ -24,7 +24,7 @@ class TestCheck : public QObject {
     TestCheck(QWidget* parent, QString path, QString args, int minMem, int maxMem, int permGen)
         : m_parent(parent), m_path(path), m_args(args), m_minMem(minMem), m_maxMem(maxMem), m_permGen(permGen)
     {}
-    virtual ~TestCheck(){};
+    virtual ~TestCheck() {};
 
     void run();
 

launcher/LaunchController.h

@@ -50,7 +50,7 @@ class LaunchController : public Task {
     void executeTask() override;
 
     LaunchController(QObject* parent = nullptr);
-    virtual ~LaunchController(){};
+    virtual ~LaunchController() {};
 
     void setInstance(InstancePtr instance) { m_instance = instance; }
 

launcher/MMCZip.h

@@ -176,7 +176,7 @@ class ExportToZipTask : public Task {
                     QString destinationPrefix = "",
                     bool followSymlinks = false,
                     bool utf8Enabled = false)
-        : ExportToZipTask(outputPath, QDir(dir), files, destinationPrefix, followSymlinks, utf8Enabled){};
+        : ExportToZipTask(outputPath, QDir(dir), files, destinationPrefix, followSymlinks, utf8Enabled) {};
 
     virtual ~ExportToZipTask() = default;
 

launcher/NullInstance.h

@@ -46,7 +46,7 @@ class NullInstance : public BaseInstance {
     {
         setVersionBroken(true);
     }
-    virtual ~NullInstance(){};
+    virtual ~NullInstance() {};
     void saveNow() override {}
     void loadSpecificSettings() override { setSpecificSettingsLoaded(true); }
     QString getStatusbarDescription() override { return tr("Unknown instance type"); };

launcher/VersionProxyModel.h

@@ -14,7 +14,7 @@ class VersionProxyModel : public QAbstractProxyModel {
 
    public:
     VersionProxyModel(QObject* parent = 0);
-    virtual ~VersionProxyModel(){};
+    virtual ~VersionProxyModel() {};
 
     virtual int columnCount(const QModelIndex& parent = QModelIndex()) const override;
     virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override;

launcher/icons/IconList.h

@@ -52,7 +52,7 @@ class IconList : public QAbstractListModel {
     Q_OBJECT
    public:
     explicit IconList(const QStringList& builtinPaths, QString path, QObject* parent = 0);
-    virtual ~IconList(){};
+    virtual ~IconList() {};
 
     QIcon getIcon(const QString& key) const;
     int getIconIndex(const QString& key) const;

launcher/java/JavaCheckerJob.h

@@ -26,8 +26,8 @@ using JavaCheckerJobPtr = shared_qobject_ptr<JavaCheckerJob>;
 class JavaCheckerJob : public Task {
     Q_OBJECT
    public:
-    explicit JavaCheckerJob(QString job_name) : Task(), m_job_name(job_name){};
+    explicit JavaCheckerJob(QString job_name) : Task(), m_job_name(job_name) {};
-    virtual ~JavaCheckerJob(){};
+    virtual ~JavaCheckerJob() {};
 
     bool addJavaCheckerAction(JavaCheckerPtr base)
     {

launcher/java/JavaUtils.cpp

@@ -79,11 +79,9 @@ QProcessEnvironment CleanEnviroment()
 
     QStringList stripped = {
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
-        "LD_LIBRARY_PATH",
+        "LD_LIBRARY_PATH", "LD_PRELOAD",
-        "LD_PRELOAD",
 #endif
-        "QT_PLUGIN_PATH",
+        "QT_PLUGIN_PATH", "QT_FONTPATH"
-        "QT_FONTPATH"
     };
     for (auto key : rawenv.keys()) {
         auto value = rawenv.value(key);

launcher/launch/LaunchStep.h

@@ -25,7 +25,7 @@ class LaunchStep : public Task {
     Q_OBJECT
    public: /* methods */
     explicit LaunchStep(LaunchTask* parent) : Task(nullptr), m_parent(parent) { bind(parent); };
-    virtual ~LaunchStep(){};
+    virtual ~LaunchStep() {};
 
    private: /* methods */
     void bind(LaunchTask* parent);
@@ -37,9 +37,9 @@ class LaunchStep : public Task {
     void progressReportingRequest();
 
    public slots:
-    virtual void proceed(){};
+    virtual void proceed() {};
     // called in the opposite order than the Task launch(), used to clean up or otherwise undo things after the launch ends
-    virtual void finalize(){};
+    virtual void finalize() {};
 
    protected: /* data */
     LaunchTask* m_parent;

launcher/launch/LaunchTask.h

@@ -55,7 +55,7 @@ class LaunchTask : public Task {
 
    public: /* methods */
     static shared_qobject_ptr<LaunchTask> create(InstancePtr inst);
-    virtual ~LaunchTask(){};
+    virtual ~LaunchTask() {};
 
     void appendStep(shared_qobject_ptr<LaunchStep> step);
     void prependStep(shared_qobject_ptr<LaunchStep> step);

launcher/launch/steps/CheckJava.h

@@ -22,8 +22,8 @@
 class CheckJava : public LaunchStep {
     Q_OBJECT
    public:
-    explicit CheckJava(LaunchTask* parent) : LaunchStep(parent){};
+    explicit CheckJava(LaunchTask* parent) : LaunchStep(parent) {};
-    virtual ~CheckJava(){};
+    virtual ~CheckJava() {};
 
     virtual void executeTask();
     virtual bool canAbort() const { return false; }

launcher/launch/steps/LookupServerAddress.h

@@ -25,7 +25,7 @@ class LookupServerAddress : public LaunchStep {
     Q_OBJECT
    public:
     explicit LookupServerAddress(LaunchTask* parent);
-    virtual ~LookupServerAddress(){};
+    virtual ~LookupServerAddress() {};
 
     virtual void executeTask();
     virtual bool abort();

launcher/launch/steps/PostLaunchCommand.h

@@ -22,7 +22,7 @@ class PostLaunchCommand : public LaunchStep {
     Q_OBJECT
    public:
     explicit PostLaunchCommand(LaunchTask* parent);
-    virtual ~PostLaunchCommand(){};
+    virtual ~PostLaunchCommand() {};
 
     virtual void executeTask();
     virtual bool abort();

launcher/launch/steps/PreLaunchCommand.h

@@ -22,7 +22,7 @@ class PreLaunchCommand : public LaunchStep {
     Q_OBJECT
    public:
     explicit PreLaunchCommand(LaunchTask* parent);
-    virtual ~PreLaunchCommand(){};
+    virtual ~PreLaunchCommand() {};
 
     virtual void executeTask();
     virtual bool abort();

launcher/launch/steps/QuitAfterGameStop.h

@@ -23,8 +23,8 @@
 class QuitAfterGameStop : public LaunchStep {
     Q_OBJECT
    public:
-    explicit QuitAfterGameStop(LaunchTask* parent) : LaunchStep(parent){};
+    explicit QuitAfterGameStop(LaunchTask* parent) : LaunchStep(parent) {};
-    virtual ~QuitAfterGameStop(){};
+    virtual ~QuitAfterGameStop() {};
 
     virtual void executeTask();
     virtual bool canAbort() const { return false; }

launcher/launch/steps/TextPrint.h

@@ -28,7 +28,7 @@ class TextPrint : public LaunchStep {
    public:
     explicit TextPrint(LaunchTask* parent, const QStringList& lines, MessageLevel::Enum level);
     explicit TextPrint(LaunchTask* parent, const QString& line, MessageLevel::Enum level);
-    virtual ~TextPrint(){};
+    virtual ~TextPrint() {};
 
     virtual void executeTask();
     virtual bool canAbort() const;

launcher/launch/steps/Update.h

@@ -25,8 +25,8 @@
 class Update : public LaunchStep {
     Q_OBJECT
    public:
-    explicit Update(LaunchTask* parent, Net::Mode mode) : LaunchStep(parent), m_mode(mode){};
+    explicit Update(LaunchTask* parent, Net::Mode mode) : LaunchStep(parent), m_mode(mode) {};
-    virtual ~Update(){};
+    virtual ~Update() {};
 
     void executeTask() override;
     bool canAbort() const override;

launcher/meta/BaseEntity.cpp

@@ -25,8 +25,8 @@
 
 class ParsingValidator : public Net::Validator {
    public: /* con/des */
-    ParsingValidator(Meta::BaseEntity* entity) : m_entity(entity){};
+    ParsingValidator(Meta::BaseEntity* entity) : m_entity(entity) {};
-    virtual ~ParsingValidator(){};
+    virtual ~ParsingValidator() {};
 
    public: /* methods */
     bool init(QNetworkRequest&) override { return true; }

launcher/minecraft/MinecraftInstance.h

@@ -56,7 +56,7 @@ class MinecraftInstance : public BaseInstance {
     Q_OBJECT
    public:
     MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString& rootDir);
-    virtual ~MinecraftInstance(){};
+    virtual ~MinecraftInstance() {};
     virtual void saveNow() override;
 
     void loadSpecificSettings() override;

launcher/minecraft/MinecraftLoadAndCheck.h

@@ -31,7 +31,7 @@ class MinecraftLoadAndCheck : public Task {
     Q_OBJECT
    public:
     explicit MinecraftLoadAndCheck(MinecraftInstance* inst, QObject* parent = 0);
-    virtual ~MinecraftLoadAndCheck(){};
+    virtual ~MinecraftLoadAndCheck() {};
     void executeTask() override;
 
    private slots:

launcher/minecraft/MinecraftUpdate.h

@@ -33,7 +33,7 @@ class MinecraftUpdate : public Task {
     Q_OBJECT
    public:
     explicit MinecraftUpdate(MinecraftInstance* inst, QObject* parent = 0);
-    virtual ~MinecraftUpdate(){};
+    virtual ~MinecraftUpdate() {};
 
     void executeTask() override;
     bool canAbort() const override;

launcher/minecraft/auth/AccountTask.h

@@ -65,7 +65,7 @@ class AccountTask : public Task {
     Q_OBJECT
    public:
     explicit AccountTask(AccountData* data, QObject* parent = 0);
-    virtual ~AccountTask(){};
+    virtual ~AccountTask() {};
 
     AccountTaskState m_taskState = AccountTaskState::STATE_CREATED;
 

launcher/minecraft/launch/ClaimAccount.h

@@ -22,7 +22,7 @@ class ClaimAccount : public LaunchStep {
     Q_OBJECT
    public:
     explicit ClaimAccount(LaunchTask* parent, AuthSessionPtr session);
-    virtual ~ClaimAccount(){};
+    virtual ~ClaimAccount() {};
 
     void executeTask() override;
     void finalize() override;

launcher/minecraft/launch/CreateGameFolders.h

@@ -24,7 +24,7 @@ class CreateGameFolders : public LaunchStep {
     Q_OBJECT
    public:
     explicit CreateGameFolders(LaunchTask* parent);
-    virtual ~CreateGameFolders(){};
+    virtual ~CreateGameFolders() {};
 
     virtual void executeTask();
     virtual bool canAbort() const { return false; }

launcher/minecraft/launch/ExtractNatives.h

@@ -21,8 +21,8 @@
 class ExtractNatives : public LaunchStep {
     Q_OBJECT
    public:
-    explicit ExtractNatives(LaunchTask* parent) : LaunchStep(parent){};
+    explicit ExtractNatives(LaunchTask* parent) : LaunchStep(parent) {};
-    virtual ~ExtractNatives(){};
+    virtual ~ExtractNatives() {};
 
     void executeTask() override;
     bool canAbort() const override { return false; }

launcher/minecraft/launch/LauncherPartLaunch.h

@@ -25,7 +25,7 @@ class LauncherPartLaunch : public LaunchStep {
     Q_OBJECT
    public:
     explicit LauncherPartLaunch(LaunchTask* parent);
-    virtual ~LauncherPartLaunch(){};
+    virtual ~LauncherPartLaunch() {};
 
     virtual void executeTask();
     virtual bool abort();

launcher/minecraft/launch/ModMinecraftJar.h

@@ -21,8 +21,8 @@
 class ModMinecraftJar : public LaunchStep {
     Q_OBJECT
    public:
-    explicit ModMinecraftJar(LaunchTask* parent) : LaunchStep(parent){};
+    explicit ModMinecraftJar(LaunchTask* parent) : LaunchStep(parent) {};
-    virtual ~ModMinecraftJar(){};
+    virtual ~ModMinecraftJar() {};
 
     virtual void executeTask() override;
     virtual bool canAbort() const override { return false; }

launcher/minecraft/launch/PrintInstanceInfo.h

@@ -25,8 +25,8 @@ class PrintInstanceInfo : public LaunchStep {
     Q_OBJECT
    public:
     explicit PrintInstanceInfo(LaunchTask* parent, AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin)
-        : LaunchStep(parent), m_session(session), m_serverToJoin(serverToJoin){};
+        : LaunchStep(parent), m_session(session), m_serverToJoin(serverToJoin) {};
-    virtual ~PrintInstanceInfo(){};
+    virtual ~PrintInstanceInfo() {};
 
     virtual void executeTask();
     virtual bool canAbort() const { return false; }

launcher/minecraft/launch/ReconstructAssets.h

@@ -21,8 +21,8 @@
 class ReconstructAssets : public LaunchStep {
     Q_OBJECT
    public:
-    explicit ReconstructAssets(LaunchTask* parent) : LaunchStep(parent){};
+    explicit ReconstructAssets(LaunchTask* parent) : LaunchStep(parent) {};
-    virtual ~ReconstructAssets(){};
+    virtual ~ReconstructAssets() {};
 
     void executeTask() override;
     bool canAbort() const override { return false; }

launcher/minecraft/launch/ScanModFolders.h

@@ -21,8 +21,8 @@
 class ScanModFolders : public LaunchStep {
     Q_OBJECT
    public:
-    explicit ScanModFolders(LaunchTask* parent) : LaunchStep(parent){};
+    explicit ScanModFolders(LaunchTask* parent) : LaunchStep(parent) {};
-    virtual ~ScanModFolders(){};
+    virtual ~ScanModFolders() {};
 
     virtual void executeTask() override;
     virtual bool canAbort() const override { return false; }

launcher/minecraft/launch/VerifyJavaInstall.h

@@ -42,7 +42,7 @@ class VerifyJavaInstall : public LaunchStep {
     Q_OBJECT
 
    public:
-    explicit VerifyJavaInstall(LaunchTask* parent) : LaunchStep(parent){};
+    explicit VerifyJavaInstall(LaunchTask* parent) : LaunchStep(parent) {};
     ~VerifyJavaInstall() override = default;
 
     void executeTask() override;

launcher/minecraft/mod/ResourceFolderModel.cpp

@@ -281,10 +281,8 @@ void ResourceFolderModel::resolveResource(Resource* res)
 
     connect(
         task.get(), &Task::succeeded, this, [=] { onParseSucceeded(ticket, res->internal_id()); }, Qt::ConnectionType::QueuedConnection);
-    connect(
+    connect(task.get(), &Task::failed, this, [=] { onParseFailed(ticket, res->internal_id()); }, Qt::ConnectionType::QueuedConnection);
-        task.get(), &Task::failed, this, [=] { onParseFailed(ticket, res->internal_id()); }, Qt::ConnectionType::QueuedConnection);
+    connect(task.get(), &Task::finished, this, [=] { m_active_parse_tasks.remove(ticket); }, Qt::ConnectionType::QueuedConnection);
-    connect(
-        task.get(), &Task::finished, this, [=] { m_active_parse_tasks.remove(ticket); }, Qt::ConnectionType::QueuedConnection);
 
     m_helper_thread_task.addTask(task);
 

launcher/minecraft/update/FMLLibrariesTask.h

@@ -9,7 +9,7 @@ class FMLLibrariesTask : public Task {
     Q_OBJECT
    public:
     FMLLibrariesTask(MinecraftInstance* inst);
-    virtual ~FMLLibrariesTask(){};
+    virtual ~FMLLibrariesTask() {};
 
     void executeTask() override;
 

launcher/minecraft/update/FoldersTask.h

@@ -7,7 +7,7 @@ class FoldersTask : public Task {
     Q_OBJECT
    public:
     FoldersTask(MinecraftInstance* inst);
-    virtual ~FoldersTask(){};
+    virtual ~FoldersTask() {};
 
     void executeTask() override;
 

launcher/minecraft/update/LibrariesTask.h

@@ -7,7 +7,7 @@ class LibrariesTask : public Task {
     Q_OBJECT
    public:
     LibrariesTask(MinecraftInstance* inst);
-    virtual ~LibrariesTask(){};
+    virtual ~LibrariesTask() {};
 
     void executeTask() override;
 

launcher/modplatform/CheckUpdateTask.h

@@ -17,7 +17,7 @@ class CheckUpdateTask : public Task {
                     std::list<Version>& mcVersions,
                     std::optional<ModPlatform::ModLoaderTypes> loaders,
                     std::shared_ptr<ModFolderModel> mods_folder)
-        : Task(nullptr), m_mods(mods), m_game_versions(mcVersions), m_loaders(loaders), m_mods_folder(mods_folder){};
+        : Task(nullptr), m_mods(mods), m_game_versions(mcVersions), m_loaders(loaders), m_mods_folder(mods_folder) {};
 
     struct UpdatableMod {
         QString name;

launcher/modplatform/flame/FileResolvingTask.h

@@ -9,7 +9,7 @@ class FileResolvingTask : public Task {
     Q_OBJECT
    public:
     explicit FileResolvingTask(const shared_qobject_ptr<QNetworkAccessManager>& network, Flame::Manifest& toProcess);
-    virtual ~FileResolvingTask(){};
+    virtual ~FileResolvingTask() {};
 
     bool canAbort() const override { return true; }
     bool abort() override;

launcher/modplatform/legacy_ftb/PackFetchTask.h

@@ -13,7 +13,7 @@ class PackFetchTask : public QObject {
     Q_OBJECT
 
    public:
-    PackFetchTask(shared_qobject_ptr<QNetworkAccessManager> network) : QObject(nullptr), m_network(network){};
+    PackFetchTask(shared_qobject_ptr<QNetworkAccessManager> network) : QObject(nullptr), m_network(network) {};
     virtual ~PackFetchTask() = default;
 
     void fetch();

launcher/modplatform/modrinth/ModrinthPackIndex.cpp

@@ -136,8 +136,9 @@ void Modrinth::loadIndexedPackVersions(ModPlatform::IndexedPack& pack, QJsonArra
     pack.versionsLoaded = true;
 }
 
-auto Modrinth::loadIndexedPackVersion(QJsonObject& obj, QString preferred_hash_type, QString preferred_file_name)
+auto Modrinth::loadIndexedPackVersion(QJsonObject& obj,
-    -> ModPlatform::IndexedVersion
+                                      QString preferred_hash_type,
+                                      QString preferred_file_name) -> ModPlatform::IndexedVersion
 {
     ModPlatform::IndexedVersion file;
 
@@ -251,8 +252,9 @@ auto Modrinth::loadIndexedPackVersion(QJsonObject& obj, QString preferred_hash_t
     return {};
 }
 
-auto Modrinth::loadDependencyVersions([[maybe_unused]] const ModPlatform::Dependency& m, QJsonArray& arr, const BaseInstance* inst)
+auto Modrinth::loadDependencyVersions([[maybe_unused]] const ModPlatform::Dependency& m,
-    -> ModPlatform::IndexedVersion
+                                      QJsonArray& arr,
+                                      const BaseInstance* inst) -> ModPlatform::IndexedVersion
 {
     auto profile = (dynamic_cast<const MinecraftInstance*>(inst))->getPackProfile();
     QString mcVersion = profile->getComponentVersion("net.minecraft");

launcher/modplatform/packwiz/Packwiz.cpp

@@ -91,8 +91,9 @@ auto intEntry(toml::table table, QString entry_name) -> int
     return node.value_or(0);
 }
 
-auto V1::createModFormat([[maybe_unused]] QDir& index_dir, ModPlatform::IndexedPack& mod_pack, ModPlatform::IndexedVersion& mod_version)
+auto V1::createModFormat([[maybe_unused]] QDir& index_dir,
-    -> Mod
+                         ModPlatform::IndexedPack& mod_pack,
+                         ModPlatform::IndexedVersion& mod_version) -> Mod
 {
     Mod mod;
 

launcher/net/ByteArraySink.h

@@ -45,7 +45,7 @@ namespace Net {
  */
 class ByteArraySink : public Sink {
    public:
-    ByteArraySink(std::shared_ptr<QByteArray> output) : m_output(output){};
+    ByteArraySink(std::shared_ptr<QByteArray> output) : m_output(output) {};
 
     virtual ~ByteArraySink() = default;
 

launcher/net/ChecksumValidator.h

@@ -44,7 +44,7 @@ namespace Net {
 class ChecksumValidator : public Validator {
    public:
     ChecksumValidator(QCryptographicHash::Algorithm algorithm, QByteArray expected = QByteArray())
-        : m_checksum(algorithm), m_expected(expected){};
+        : m_checksum(algorithm), m_expected(expected) {};
     virtual ~ChecksumValidator() = default;
 
    public:

launcher/net/FileSink.h

@@ -42,7 +42,7 @@
 namespace Net {
 class FileSink : public Sink {
    public:
-    FileSink(QString filename) : m_filename(filename){};
+    FileSink(QString filename) : m_filename(filename) {};
     virtual ~FileSink() = default;
 
    public:

launcher/net/StaticHeaderProxy.h

@@ -25,7 +25,7 @@ namespace Net {
 
 class StaticHeaderProxy : public HeaderProxy {
    public:
-    StaticHeaderProxy(QList<HeaderPair> hdrs = {}) : HeaderProxy(), m_hdrs(hdrs){};
+    StaticHeaderProxy(QList<HeaderPair> hdrs = {}) : HeaderProxy(), m_hdrs(hdrs) {};
     virtual ~StaticHeaderProxy() = default;
 
    public:

launcher/pathmatcher/FSTreeMatcher.h

@@ -6,7 +6,7 @@
 
 class FSTreeMatcher : public IPathMatcher {
    public:
-    virtual ~FSTreeMatcher(){};
+    virtual ~FSTreeMatcher() {};
     FSTreeMatcher(SeparatorPrefixTree<'/'>& tree) : m_fsTree(tree) {}
 
     bool matches(const QString& string) const override { return m_fsTree.covers(string); }

launcher/pathmatcher/MultiMatcher.h

@@ -4,7 +4,7 @@
 
 class MultiMatcher : public IPathMatcher {
    public:
-    virtual ~MultiMatcher(){};
+    virtual ~MultiMatcher() {};
     MultiMatcher() {}
     MultiMatcher& add(Ptr add)
     {

launcher/pathmatcher/SimplePrefixMatcher.h

@@ -7,7 +7,7 @@
 
 class SimplePrefixMatcher : public IPathMatcher {
    public:
-    virtual ~SimplePrefixMatcher(){};
+    virtual ~SimplePrefixMatcher() {};
     SimplePrefixMatcher(const QString& prefix)
     {
         m_prefix = prefix;

launcher/screenshots/ImgurAlbumCreation.h

@@ -49,7 +49,7 @@ class ImgurAlbumCreation : public Net::NetRequest {
 
     class Sink : public Net::Sink {
        public:
-        Sink(std::shared_ptr<Result> res) : m_result(res){};
+        Sink(std::shared_ptr<Result> res) : m_result(res) {};
         virtual ~Sink() = default;
 
        public:

launcher/screenshots/ImgurUpload.h

@@ -43,7 +43,7 @@ class ImgurUpload : public Net::NetRequest {
    public:
     class Sink : public Net::Sink {
        public:
-        Sink(ScreenShot::Ptr shot) : m_shot(shot){};
+        Sink(ScreenShot::Ptr shot) : m_shot(shot) {};
         virtual ~Sink() = default;
 
        public:

launcher/ui/dialogs/ModUpdateDialog.cpp

@@ -94,17 +94,15 @@ void ModUpdateDialog::checkCandidates()
 
     if (!m_modrinth_to_update.empty()) {
         m_modrinth_check_task.reset(new ModrinthCheckUpdate(m_modrinth_to_update, versions, loaders, m_mod_model));
-        connect(m_modrinth_check_task.get(), &CheckUpdateTask::checkFailed, this, [this](Mod* mod, QString reason, QUrl recover_url) {
+        connect(m_modrinth_check_task.get(), &CheckUpdateTask::checkFailed, this,
-            m_failed_check_update.append({ mod, reason, recover_url });
+                [this](Mod* mod, QString reason, QUrl recover_url) { m_failed_check_update.append({ mod, reason, recover_url }); });
-        });
         check_task.addTask(m_modrinth_check_task);
     }
 
     if (!m_flame_to_update.empty()) {
         m_flame_check_task.reset(new FlameCheckUpdate(m_flame_to_update, versions, loaders, m_mod_model));
-        connect(m_flame_check_task.get(), &CheckUpdateTask::checkFailed, this, [this](Mod* mod, QString reason, QUrl recover_url) {
+        connect(m_flame_check_task.get(), &CheckUpdateTask::checkFailed, this,
-            m_failed_check_update.append({ mod, reason, recover_url });
+                [this](Mod* mod, QString reason, QUrl recover_url) { m_failed_check_update.append({ mod, reason, recover_url }); });
-        });
         check_task.addTask(m_flame_check_task);
     }
 

launcher/ui/dialogs/SkinUploadDialog.h

@@ -11,7 +11,7 @@ class SkinUploadDialog : public QDialog {
     Q_OBJECT
    public:
     explicit SkinUploadDialog(MinecraftAccountPtr acct, QWidget* parent = 0);
-    virtual ~SkinUploadDialog(){};
+    virtual ~SkinUploadDialog() {};
 
    public slots:
     void on_buttonBox_accepted();

launcher/ui/dialogs/VersionSelectDialog.h

@@ -37,7 +37,7 @@ class VersionSelectDialog : public QDialog {
 
    public:
     explicit VersionSelectDialog(BaseVersionList* vlist, QString title, QWidget* parent = 0, bool cancelable = true);
-    virtual ~VersionSelectDialog(){};
+    virtual ~VersionSelectDialog() {};
 
     int exec() override;
 

launcher/ui/pages/BasePageContainer.h

@@ -4,7 +4,7 @@ class BasePage;
 
 class BasePageContainer {
    public:
-    virtual ~BasePageContainer(){};
+    virtual ~BasePageContainer() {};
     virtual bool selectPage(QString pageId) = 0;
     virtual BasePage* selectedPage() const = 0;
     virtual BasePage* getPage(QString pageId) { return nullptr; };

launcher/ui/pages/instance/ManagedPackPage.h

@@ -50,7 +50,7 @@ class ManagedPackPage : public QWidget, public BasePage {
 
     /** Gets the necessary information about the managed pack, such as
      *  available versions*/
-    virtual void parseManagedPack(){};
+    virtual void parseManagedPack() {};
 
     /** URL of the managed pack.
      *  Not the version-specific one.
@@ -64,8 +64,8 @@ class ManagedPackPage : public QWidget, public BasePage {
      */
     virtual void suggestVersion();
 
-    virtual void update(){};
+    virtual void update() {};
-    virtual void updateFromFile(){};
+    virtual void updateFromFile() {};
 
    protected slots:
     /** Does the necessary UI changes for when something failed.

launcher/ui/pages/instance/ServersPage.cpp

@@ -168,7 +168,7 @@ class ServersModel : public QAbstractListModel {
         m_saveTimer.setInterval(5000);
         connect(&m_saveTimer, &QTimer::timeout, this, &ServersModel::save_internal);
     }
-    virtual ~ServersModel(){};
+    virtual ~ServersModel() {};
 
     void observe()
     {

launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.h

@@ -93,8 +93,9 @@ class ModrinthModPage : public ModPage {
 
     [[nodiscard]] inline auto helpPage() const -> QString override { return "Mod-platform"; }
 
-    auto validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, std::optional<ModPlatform::ModLoaderTypes> loaders = {}) const
+    auto validateVersion(ModPlatform::IndexedVersion& ver,
-        -> bool override;
+                         QString mineVer,
+                         std::optional<ModPlatform::ModLoaderTypes> loaders = {}) const -> bool override;
 };
 
 class ModrinthResourcePackPage : public ResourcePackResourcePage {

launcher/ui/setupwizard/BaseWizardPage.h

@@ -6,7 +6,7 @@
 class BaseWizardPage : public QWizardPage {
    public:
     explicit BaseWizardPage(QWidget* parent = Q_NULLPTR) : QWizardPage(parent) {}
-    virtual ~BaseWizardPage(){};
+    virtual ~BaseWizardPage() {};
 
     virtual bool wantsRefreshButton() { return false; }
     virtual void refresh() {}

launcher/ui/setupwizard/JavaWizardPage.h

@@ -9,7 +9,7 @@ class JavaWizardPage : public BaseWizardPage {
    public:
     explicit JavaWizardPage(QWidget* parent = Q_NULLPTR);
 
-    virtual ~JavaWizardPage(){};
+    virtual ~JavaWizardPage() {};
 
     bool wantsRefreshButton() override;
     void refresh() override;

launcher/ui/widgets/JavaSettingsWidget.h

@@ -25,7 +25,7 @@ class JavaSettingsWidget : public QWidget {
 
    public:
     explicit JavaSettingsWidget(QWidget* parent);
-    virtual ~JavaSettingsWidget(){};
+    virtual ~JavaSettingsWidget() {};
 
     enum class JavaStatus { NotSet, Pending, Good, DoesNotExist, DoesNotStart, ReturnedInvalidData } javaStatus = JavaStatus::NotSet;
 

launcher/ui/widgets/LanguageSelectionWidget.h

@@ -27,7 +27,7 @@ class LanguageSelectionWidget : public QWidget {
     Q_OBJECT
    public:
     explicit LanguageSelectionWidget(QWidget* parent = 0);
-    virtual ~LanguageSelectionWidget(){};
+    virtual ~LanguageSelectionWidget() {};
 
     QString getSelectedLanguageKey() const;
     void retranslate();

launcher/updater/prismupdater/PrismUpdater.cpp

@@ -474,8 +474,7 @@ PrismUpdaterApp::PrismUpdaterApp(int& argc, char** argv) : QApplication(argc, ar
             target_dir = QDir(m_rootPath).absoluteFilePath("..");
         }
 
-        QMetaObject::invokeMethod(
+        QMetaObject::invokeMethod(this, [this, target_dir]() { moveAndFinishUpdate(target_dir); }, Qt::QueuedConnection);
-            this, [this, target_dir]() { moveAndFinishUpdate(target_dir); }, Qt::QueuedConnection);
 
     } else {
         QMetaObject::invokeMethod(this, &PrismUpdaterApp::loadReleaseList, Qt::QueuedConnection);

nix/dev.nix

@@ -19,7 +19,7 @@
         };
       };
 
-      tools.clang-tools = lib.mkForce pkgs.clang-tools_16;
+      tools.clang-tools = lib.mkForce pkgs.clang-tools_18;
     };
 
     devShells.default = pkgs.mkShell {

nix/distribution.nix

@@ -13,8 +13,6 @@
     in {
       inherit
         (ourPackages)
-        fjordlauncher-qt5-unwrapped
-        fjordlauncher-qt5
         fjordlauncher-unwrapped
         fjordlauncher
         ;
@@ -25,37 +23,11 @@
   flake = {
     overlays.default = final: prev: let
       version = builtins.substring 0 8 self.lastModifiedDate or "dirty";
-
+    in {
-      filteredSelf = inputs.nix-filter.lib.filter {
+      fjordlauncher-unwrapped = prev.callPackage ./pkg {
-        root = ../.;
-        include = [
-          "buildconfig"
-          "cmake"
-          "launcher"
-          "libraries"
-          "program_info"
-          "tests"
-          ../COPYING.md
-          ../CMakeLists.txt
-        ];
-      };
-
-      # common args for prismlauncher evaluations
-      unwrappedArgs = {
-        self = filteredSelf;
-
         inherit (inputs) libnbtplusplus;
-        inherit ((final.darwin or prev.darwin).apple_sdk.frameworks) Cocoa;
         inherit version;
       };
-    in {
-      fjordlauncher-qt5-unwrapped = prev.libsForQt5.callPackage ./pkg unwrappedArgs;
-
-      fjordlauncher-qt5 = prev.libsForQt5.callPackage ./pkg/wrapper.nix {
-        fjordlauncher-unwrapped = final.fjordlauncher-qt5-unwrapped;
-      };
-
-      fjordlauncher-unwrapped = prev.qt6Packages.callPackage ./pkg unwrappedArgs;
 
       fjordlauncher = prev.qt6Packages.callPackage ./pkg/wrapper.nix {
         inherit (final) fjordlauncher-unwrapped;

nix/pkg/default.nix

@@ -1,74 +1,105 @@
 {
   lib,
   stdenv,
-  canonicalize-jars-hook,
   cmake,
   cmark,
-  Cocoa,
+  darwin,
-  ninja,
-  jdk17,
-  zlib,
-  qtbase,
-  quazip,
   extra-cmake-modules,
-  tomlplusplus,
-  ghc_filesystem,
   gamemode,
+  ghc_filesystem,
+  jdk17,
+  kdePackages,
+  ninja,
+  stripJavaArchivesHook,
+  tomlplusplus,
+  zlib,
   msaClientID ? null,
   gamemodeSupport ? stdenv.isLinux,
-  self,
   version,
   libnbtplusplus,
 }:
-assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is only available on Linux";
+assert lib.assertMsg (
-  stdenv.mkDerivation rec {
+  gamemodeSupport -> stdenv.isLinux
+) "gamemodeSupport is only available on Linux.";
+  stdenv.mkDerivation {
     pname = "fjordlauncher-unwrapped";
     inherit version;
 
-    src = lib.cleanSource self;
+    src = lib.fileset.toSource {
-
+      root = ../../.;
-    nativeBuildInputs = [extra-cmake-modules cmake jdk17 ninja canonicalize-jars-hook];
+      fileset = lib.fileset.unions (map (fileName: ../../${fileName}) [
-    buildInputs =
+        "buildconfig"
-      [
+        "cmake"
-        qtbase
+        "launcher"
-        zlib
+        "libraries"
-        quazip
+        "program_info"
-        ghc_filesystem
+        "tests"
-        tomlplusplus
+        "COPYING.md"
-        cmark
+        "CMakeLists.txt"
-      ]
+      ]);
-      ++ lib.optional gamemodeSupport gamemode
+    };
-      ++ lib.optionals stdenv.isDarwin [Cocoa];
-
-    hardeningEnable = lib.optionals stdenv.isLinux ["pie"];
-
-    cmakeFlags =
-      [
-        "-DLauncher_BUILD_PLATFORM=nixpkgs"
-      ]
-      ++ lib.optionals (msaClientID != null) ["-DLauncher_MSA_CLIENT_ID=${msaClientID}"]
-      ++ lib.optionals (lib.versionOlder qtbase.version "6") ["-DLauncher_QT_VERSION_MAJOR=5"]
-      ++ lib.optionals stdenv.isDarwin ["-DINSTALL_BUNDLE=nodeps" "-DMACOSX_SPARKLE_UPDATE_FEED_URL=''"];
 
     postUnpack = ''
       rm -rf source/libraries/libnbtplusplus
       ln -s ${libnbtplusplus} source/libraries/libnbtplusplus
     '';
 
+    nativeBuildInputs = [
+      cmake
+      ninja
+      extra-cmake-modules
+      jdk17
+      stripJavaArchivesHook
+    ];
+
+    buildInputs =
+      [
+        cmark
+        ghc_filesystem
+        kdePackages.qtbase
+        kdePackages.qtnetworkauth
+        kdePackages.quazip
+        tomlplusplus
+        zlib
+      ]
+      ++ lib.optionals stdenv.isDarwin [darwin.apple_sdk.frameworks.Cocoa]
+      ++ lib.optional gamemodeSupport gamemode;
+
+    hardeningEnable = lib.optionals stdenv.isLinux ["pie"];
+
+    cmakeFlags =
+      [
+        (lib.cmakeFeature "Launcher_BUILD_PLATFORM" "nixpkgs")
+      ]
+      ++ lib.optionals (msaClientID != null) [
+        (lib.cmakeFeature "Launcher_MSA_CLIENT_ID" (toString msaClientID))
+      ]
+      ++ lib.optionals (lib.versionOlder kdePackages.qtbase.version "6") [
+        (lib.cmakeFeature "Launcher_QT_VERSION_MAJOR" "5")
+      ]
+      ++ lib.optionals stdenv.isDarwin [
+        # we wrap our binary manually
+        (lib.cmakeFeature "INSTALL_BUNDLE" "nodeps")
+        # disable built-in updater
+        (lib.cmakeFeature "MACOSX_SPARKLE_UPDATE_FEED_URL" "''")
+        (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/Applications/")
+      ];
+
     dontWrapQtApps = true;
 
-    meta = with lib; {
+    meta = {
-      mainProgram = "fjordlauncher";
+      description = "Prism Launcher fork with support for alternative auth servers";
-      homepage = "https://github.com/unmojang/FjordLauncher/";
-      description = "A free, open source launcher for Minecraft";
       longDescription = ''
         Allows you to have multiple, separate instances of Minecraft (each with
         their own mods, texture packs, saves, etc) and helps you manage them and
         their associated options with a simple interface.
       '';
-      platforms = with platforms; linux ++ darwin;
+      homepage = "https://fjordlauncher.org/";
-      changelog = "https://github.com/unmojang/FjordLauncher/releases/tag/${version}";
+      license = lib.licenses.gpl3Only;
-      license = licenses.gpl3Only;
+      maintainers = with lib.maintainers; [
-      maintainers = with maintainers; [evan-goode];
+        evan-goode
+      ];
+      mainProgram = "fjordlauncher";
+      platforms = lib.platforms.linux ++ lib.platforms.darwin;
     };
   }

nix/pkg/wrapper.nix

@@ -3,94 +3,143 @@
   stdenv,
   symlinkJoin,
   fjordlauncher-unwrapped,
-  wrapQtAppsHook,
   addOpenGLRunpath,
-  qtbase, # needed for wrapQtAppsHook
+  flite,
-  qtsvg,
+  gamemode,
-  qtwayland,
-  xorg,
-  libpulseaudio,
-  libGL,
   glfw,
-  openal,
+  glfw-wayland-minecraft,
+  glxinfo,
   jdk8,
   jdk17,
   jdk21,
-  gamemode,
+  kdePackages,
-  flite,
+  libGL,
-  mesa-demos,
+  libpulseaudio,
-  udev,
   libusb1,
-  msaClientID ? null,
+  makeWrapper,
-  gamemodeSupport ? stdenv.isLinux,
+  openal,
-  textToSpeechSupport ? stdenv.isLinux,
+  pciutils,
-  controllerSupport ? stdenv.isLinux,
+  udev,
-  jdks ? [jdk21 jdk17 jdk8],
+  vulkan-loader,
+  xorg,
   additionalLibs ? [],
   additionalPrograms ? [],
-}: let
+  controllerSupport ? stdenv.isLinux,
-  fjordlauncherFinal = fjordlauncher-unwrapped.override {
+  gamemodeSupport ? stdenv.isLinux,
-    inherit msaClientID gamemodeSupport;
+  jdks ? [
-  };
+    jdk21
+    jdk17
+    jdk8
+  ],
+  msaClientID ? null,
+  textToSpeechSupport ? stdenv.isLinux,
+  # Adds `glfw-wayland-minecraft` to `LD_LIBRARY_PATH`
+  # when launched on wayland, allowing for the game to be run natively.
+  # Make sure to enable "Use system installation of GLFW" in instance settings
+  # for this to take effect
+  #
+  # Warning: This build of glfw may be unstable, and the launcher
+  # itself can take slightly longer to start
+  withWaylandGLFW ? false,
+}:
+assert lib.assertMsg (
+  controllerSupport -> stdenv.isLinux
+) "controllerSupport only has an effect on Linux.";
+assert lib.assertMsg (
+  textToSpeechSupport -> stdenv.isLinux
+) "textToSpeechSupport only has an effect on Linux.";
+assert lib.assertMsg (
+  withWaylandGLFW -> stdenv.isLinux
+) "withWaylandGLFW is only available on Linux."; let
+  fjordlauncher' = fjordlauncher-unwrapped.override {inherit msaClientID gamemodeSupport;};
 in
   symlinkJoin {
-    name = "fjordlauncher-${fjordlauncherFinal.version}";
+    name = "fjordlauncher-${fjordlauncher'.version}";
 
-    paths = [fjordlauncherFinal];
+    paths = [fjordlauncher'];
 
-    nativeBuildInputs = [
+    nativeBuildInputs =
-      wrapQtAppsHook
+      [kdePackages.wrapQtAppsHook]
-    ];
+      # purposefully using a shell wrapper here for variable expansion
+      # see https://github.com/NixOS/nixpkgs/issues/172583
+      ++ lib.optional withWaylandGLFW makeWrapper;
 
     buildInputs =
       [
-        qtbase
+        kdePackages.qtbase
-        qtsvg
+        kdePackages.qtsvg
       ]
-      ++ lib.optional (lib.versionAtLeast qtbase.version "6" && stdenv.isLinux) qtwayland;
+      ++ lib.optional (
+        lib.versionAtLeast kdePackages.qtbase.version "6" && stdenv.isLinux
+      )
+      kdePackages.qtwayland;
 
-    postBuild = ''
+    env = {
-      wrapQtAppsHook
+      waylandPreExec = lib.optionalString withWaylandGLFW ''
-    '';
+        if [ -n "$WAYLAND_DISPLAY" ]; then
+          export LD_LIBRARY_PATH=${lib.getLib glfw-wayland-minecraft}/lib:"$LD_LIBRARY_PATH"
+        fi
+      '';
+    };
+
+    postBuild =
+      lib.optionalString withWaylandGLFW ''
+        qtWrapperArgs+=(--run "$waylandPreExec")
+      ''
+      + ''
+        wrapQtAppsHook
+      '';
 
     qtWrapperArgs = let
       runtimeLibs =
-        (with xorg; [
+        [
-          libX11
-          libXext
-          libXcursor
-          libXrandr
-          libXxf86vm
-        ])
-        ++ [
           # lwjgl
+          glfw
           libpulseaudio
           libGL
-          glfw
           openal
           stdenv.cc.cc.lib
 
-          # oshi
+          vulkan-loader # VulkanMod's lwjgl
-          udev
+
+          udev # oshi
+
+          xorg.libX11
+          xorg.libXext
+          xorg.libXcursor
+          xorg.libXrandr
+          xorg.libXxf86vm
         ]
-        ++ lib.optional gamemodeSupport gamemode.lib
         ++ lib.optional textToSpeechSupport flite
+        ++ lib.optional gamemodeSupport gamemode.lib
         ++ lib.optional controllerSupport libusb1
         ++ additionalLibs;
 
       runtimePrograms =
         [
-          xorg.xrandr
+          glxinfo
-          mesa-demos # need glxinfo
+          pciutils # need lspci
+          xorg.xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
         ]
         ++ additionalPrograms;
     in
-      ["--prefix FJORDLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}"]
+      ["--prefix fjordLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}"]
       ++ lib.optionals stdenv.isLinux [
         "--set LD_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}"
-        # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
         "--prefix PATH : ${lib.makeBinPath runtimePrograms}"
       ];
 
-    inherit (fjordlauncherFinal) meta;
+    meta = {
+      inherit
+        (fjordlauncher'.meta)
+        description
+        longDescription
+        homepage
+        changelog
+        license
+        maintainers
+        mainProgram
+        platforms
+        ;
+    };
   }

tests/ResourceFolderModel_test.cpp

@@ -203,7 +203,10 @@ class ResourceFolderModelTest : public QObject {
 
         QCOMPARE(model.size(), 0);
 
-        { EXEC_UPDATE_TASK(model.installResource(folder_resource), QVERIFY) } {
+        {
+            EXEC_UPDATE_TASK(model.installResource(folder_resource), QVERIFY)
+        }
+        {
             EXEC_UPDATE_TASK(model.installResource(file_mod), QVERIFY)
         }