AstralTransRocketries/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-08-03 19:37:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix nix build

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2025-07-18 20:23:01 +03:00
parent 428f69b387
commit 41dc5826da
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/archive/ArchiveReader.cpp
View File

@ -33,6 +33,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ArchiveReader.h" #include "ArchiveReader.h"
#include <archive.h>
#include <archive_entry.h> #include <archive_entry.h>
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
@ -239,4 +240,5 @@ bool ArchiveReader::exists(const QString& filePath) const
return false; return false;
} }
ArchiveReader::File::File() : m_archive(ArchivePtr(archive_read_new(), archive_read_free)) {}
} // namespace MMCZip } // namespace MMCZip

9
launcher/archive/ArchiveReader.h
View File

@ -34,14 +34,13 @@
*/ */
#pragma once #pragma once
#include <archive.h>
#include <archive_entry.h>
#include <QByteArray> #include <QByteArray>
#include <QDateTime> #include <QDateTime>
#include <QStringList> #include <QStringList>
#include <memory> #include <memory>
struct archive;
struct archive_entry;
namespace MMCZip { namespace MMCZip {
class ArchiveReader { class ArchiveReader {
public: public:
@ -56,8 +55,8 @@ class ArchiveReader {
class File { class File {
public: public:
File() : m_archive(ArchivePtr(archive_read_new(), archive_read_free)) {} File();
virtual ~File() {} virtual ~File() = default;
QString filename(); QString filename();
bool isFile(); bool isFile();

1
launcher/archive/ArchiveWriter.cpp
View File

@ -34,6 +34,7 @@
*/ */
#include "ArchiveWriter.h" #include "ArchiveWriter.h"
#include <archive.h> #include <archive.h>
#include <archive_entry.h>
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>

4
launcher/archive/ArchiveWriter.h
View File

@ -34,13 +34,11 @@
*/ */
#pragma once #pragma once
#include <archive.h>
#include <archive_entry.h>
#include <QByteArray> #include <QByteArray>
#include <QFileDevice> #include <QFileDevice>
#include "archive/ArchiveReader.h" #include "archive/ArchiveReader.h"
struct archive;
namespace MMCZip { namespace MMCZip {
class ArchiveWriter { class ArchiveWriter {

2
launcher/archive/ExportToZipTask.h
View File

@ -39,7 +39,7 @@
#include <QFuture> #include <QFuture>
#include <QFutureWatcher> #include <QFutureWatcher>
#include "ArchiveWriter.h" #include "archive/ArchiveWriter.h"
#include "tasks/Task.h" #include "tasks/Task.h"
namespace MMCZip { namespace MMCZip {

2
launcher/minecraft/mod/tasks/LocalModParseTask.cpp
View File

@ -1,7 +1,6 @@
#include "LocalModParseTask.h" #include "LocalModParseTask.h"
#include <qdcss.h> #include <qdcss.h>
#include <qstringview.h>
#include <toml++/toml.h> #include <toml++/toml.h>
#include <QJsonArray> #include <QJsonArray>
#include <QJsonDocument> #include <QJsonDocument>
@ -14,7 +13,6 @@
#include "Json.h" #include "Json.h"
#include "archive/ArchiveReader.h" #include "archive/ArchiveReader.h"
#include "minecraft/mod/ModDetails.h" #include "minecraft/mod/ModDetails.h"
#include "modplatform/ModIndex.h"
#include "settings/INIFile.h" #include "settings/INIFile.h"
static const QRegularExpression s_newlineRegex("\r\n|\n|\r"); static const QRegularExpression s_newlineRegex("\r\n|\n|\r");

3
launcher/modplatform/flame/FlamePackExportTask.cpp
View File

@ -30,7 +30,6 @@
#include <memory> #include <memory>
#include "Application.h" #include "Application.h"
#include "Json.h" #include "Json.h"
#include "archive/ExportToZipTask.h"
#include "minecraft/PackProfile.h" #include "minecraft/PackProfile.h"
#include "minecraft/mod/ModFolderModel.h" #include "minecraft/mod/ModFolderModel.h"
#include "modplatform/ModIndex.h" #include "modplatform/ModIndex.h"
@ -38,6 +37,8 @@
#include "modplatform/helpers/HashUtils.h" #include "modplatform/helpers/HashUtils.h"
#include "tasks/Task.h" #include "tasks/Task.h"
#include "archive/ExportToZipTask.h"
const QString FlamePackExportTask::TEMPLATE = "<li><a href=\"{url}\">{name}{authors}</a></li>\n"; const QString FlamePackExportTask::TEMPLATE = "<li><a href=\"{url}\">{name}{authors}</a></li>\n";
const QStringList FlamePackExportTask::FILE_EXTENSIONS({ "jar", "zip" }); const QStringList FlamePackExportTask::FILE_EXTENSIONS({ "jar", "zip" });

1
nix/unwrapped.nix
View File

@ -82,6 +82,7 @@ stdenv.mkDerivation {
cmark cmark
kdePackages.qtbase kdePackages.qtbase
kdePackages.qtnetworkauth kdePackages.qtnetworkauth
kdePackages.qt5compat
libarchive libarchive
tomlplusplus tomlplusplus
zlib zlib