warren/MCModpackManager
1
0
Fork 0
mirror of https://github.com/WarrenHood/MCModpackManager.git synced 2025-04-29 09:04:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Maybe get mcmpmgr version showing in mmm and attempt to get flake working in Wayland

Browse source
This commit is contained in:
Warren Hood 2024-10-21 00:01:51 +02:00
parent ca058bbfaa
commit 835ebea1f8
2 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
flake.nix
View file

@ -15,7 +15,9 @@
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
advisory-db = { advisory-db = {
url = "github:rustsec/advisory-db"; flake = false; }; url = "github:rustsec/advisory-db";
flake = false;
};
}; };
outputs = { self, nixpkgs, crane, fenix, flake-utils, advisory-db, ... }: outputs = { self, nixpkgs, crane, fenix, flake-utils, advisory-db, ... }:
@ -86,14 +88,29 @@
cargoExtraArgs = "-p mcmpmgr"; cargoExtraArgs = "-p mcmpmgr";
src = craneLib.cleanCargoSource ./.; src = craneLib.cleanCargoSource ./.;
}); });
mmm = craneLib.buildPackage (individualCrateArgs // { mmm = craneLib.buildPackage (individualCrateArgs // rec {
pname = "mmm"; pname = "mmm";
cargoExtraArgs = "-p mmm"; cargoExtraArgs = "-p mmm";
src = craneLib.cleanCargoSource ./.; src = craneLib.cleanCargoSource ./.;
buildInputs = commonArgs.buildInputs ++ (with pkgs; [
expat
fontconfig
freetype
freetype.dev
libGL
pkg-config
xorg.libX11
xorg.libXcursor
xorg.libXi
xorg.libXrandr
wayland
libxkbcommon
]);
LD_LIBRARY_PATH = builtins.foldl' (a: b: "${a}:${b}/lib") "${pkgs.vulkan-loader}/lib" buildInputs;
}); });
in in
{ {
checks = {}; checks = { };
packages = { packages = {
inherit mcmpmgr; inherit mcmpmgr;
@ -116,7 +133,7 @@
}; };
devShells.default = craneLib.devShell { devShells.default = craneLib.devShell rec {
# Inherit inputs from checks. # Inherit inputs from checks.
checks = self.checks.${system}; checks = self.checks.${system};
@ -129,6 +146,23 @@
pkgs.nil pkgs.nil
pkgs.rust-analyzer pkgs.rust-analyzer
]; ];
buildInputs = with pkgs; [
expat
fontconfig
freetype
freetype.dev
libGL
pkg-config
xorg.libX11
xorg.libXcursor
xorg.libXi
xorg.libXrandr
wayland
libxkbcommon
];
LD_LIBRARY_PATH = builtins.foldl' (a: b: "${a}:${b}/lib") "${pkgs.vulkan-loader}/lib" buildInputs;
}; };
}); });
} }

4
mmm/src/main.rs
View file

@ -11,6 +11,8 @@ use iced::{Alignment, Element, Length, Sandbox, Settings, Theme};
use mcmpmgr::profiles::{self, Profile}; use mcmpmgr::profiles::{self, Profile};
use mcmpmgr::providers::DownloadSide; use mcmpmgr::providers::DownloadSide;
const VERSION: &str = env!("CARGO_PKG_VERSION");
pub fn main() -> iced::Result { pub fn main() -> iced::Result {
ManagerGUI::run(Settings { ManagerGUI::run(Settings {
window: iced::window::Settings { window: iced::window::Settings {
@ -145,7 +147,7 @@ impl Application for ManagerGUI {
} }
fn title(&self) -> String { fn title(&self) -> String {
String::from("Minecraft Modpack Manager") format!("Minecraft Modpack Manager v{VERSION}")
} }
fn update(&mut self, message: Message) -> Command<Message> { fn update(&mut self, message: Message) -> Command<Message> {