diff options
| -rw-r--r-- | BUILD.md | 33 | ||||
| -rw-r--r-- | flake.lock | 10 | ||||
| -rw-r--r-- | flake.nix | 2 |
3 files changed, 13 insertions, 32 deletions
@@ -53,7 +53,7 @@ This is the preferred method for installation, and is suitable for packages. ```sh # configure everything cmake -S . -B build \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="/usr" \ # Use "/usr" for packages, otherwise, leave it at the default "/usr/local". -DLauncher_LAYOUT=lin-system cd build @@ -75,15 +75,15 @@ The deb will be located in the directory the repo was cloned in. ### Building a .rpm Build dependencies are automatically installed using `dnf`, but you do need the `rpmdevtools` package (on Fedora) -in order to fetch sources and setup your tree. +in order to fetch sources and setup your tree. +You don't need to clone the repo for this; the spec file handles that ``` cd ~ # setup your ~/rpmbuild directory, required for rpmbuild to work. rpmdev-setuptree -# note: submodules are not needed here, as the spec file will download the tarball instead -git clone https://github.com/PolyMC/PolyMC.git -cd PolyMC/packages/rpm +# get the rpm spec file from the polymc-misc repo +wget https://raw.githubusercontent.com/PolyMC/polymc-misc/master/rpm/polymc.spec # install build dependencies sudo dnf builddep polymc.spec # download build sources @@ -94,34 +94,15 @@ rpmbuild -bb polymc.spec The path to the rpm packages will be printed when the build is complete. -### Building from command line - -You need a source folder, a build folder and an install folder. - -``` -# make all the folders -mkdir ~/PolyMC && cd ~/PolyMC -mkdir build -mkdir install -# clone the complete source -git clone --recursive https://github.com/PolyMC/PolyMC.git src -# configure the project -cd build -cmake -DCMAKE_INSTALL_PREFIX=../install ../src -make -j$(nproc) install -``` - -The path to the rpm packages will be printed when the build is complete. - ### Building a flatpak -You only need to clone the flatpak sources +You don't need to clone the entire PolyMC repo for this; the flatpak file handles that. `flatpak` and `flatpak-builder` need to be installed on your system ```sh git clone https://github.com/flathub/org.polymc.PolyMC cd org.polymc.PolyMC -# remove --user and --install if you want to build without installing +# remove --user --install if you want to build without installing flatpak-builder --user --install flatbuild org.polymc.PolyMC.yml ``` @@ -66,15 +66,15 @@ "quazip": { "flake": false, "locked": { - "lastModified": 1633895098, - "narHash": "sha256-+Of0M2IAoTf1CyC0teCpsyurv6xfqiBo84V49dSeNTA=", - "owner": "multimc", + "lastModified": 1643049383, + "narHash": "sha256-LcJY6yd6GyeL7X5MP4L94diceM1TYespWByliBsjK98=", + "owner": "stachenov", "repo": "quazip", - "rev": "b1a72ac0bb5a732bf887a535ab75c6f9bedb6b6b", + "rev": "09ec1d10c6d627f895109b21728dda000cbfa7d1", "type": "github" }, "original": { - "owner": "multimc", + "owner": "stachenov", "repo": "quazip", "type": "github" } @@ -11,7 +11,7 @@ flake = false; }; inputs.quazip = { - url = "github:multimc/quazip"; + url = "github:stachenov/quazip"; flake = false; }; |