Build a flake extension to install fitnesstrax directly from git #187

Merged
savanni merged 3 commits from fitnesstrax/installer into main 2024-02-12 15:17:20 +00:00
4 changed files with 18 additions and 3 deletions

2
Cargo.lock generated
View File

@ -936,7 +936,7 @@ checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6"
[[package]] [[package]]
name = "fitnesstrax" name = "fitnesstrax"
version = "0.4.0" version = "0.4.1"
dependencies = [ dependencies = [
"async-channel", "async-channel",
"async-trait", "async-trait",

View File

@ -1,6 +1,6 @@
[package] [package]
name = "fitnesstrax" name = "fitnesstrax"
version = "0.4.0" version = "0.4.1"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View File

@ -0,0 +1,14 @@
{ gtkNativeInputs }:
attrs: {
nativeBuildInputs = gtkNativeInputs;
postInstall = ''
install -Dt $out/share/applications resources/fitnesstrax.desktop
install -Dt $out/gsettings-schemas/${attrs.crateName}-${attrs.version}/glib-2.0/schemas resources/com.luminescent-dreams.fitnesstrax.gschema.xml
glib-compile-schemas $out/gsettings-schemas/${attrs.crateName}-${attrs.version}/glib-2.0/schemas
'';
preFixup = ''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : $out/gsettings-schemas/${attrs.crateName}-${attrs.version}
)
'';
}

View File

@ -58,6 +58,7 @@
pkgs.pkg-config pkgs.pkg-config
pkgs.gtk4 pkgs.gtk4
pkgs.libadwaita pkgs.libadwaita
pkgs.wrapGAppsHook4
]; ];
cargoOverrides = pkgs: pkgs.buildRustCrate.override { cargoOverrides = pkgs: pkgs.buildRustCrate.override {
@ -68,7 +69,7 @@
libadwaita-sys = attrs: { nativeBuildInputs = gtkNativeInputs; }; libadwaita-sys = attrs: { nativeBuildInputs = gtkNativeInputs; };
dashboard = attrs: { nativeBuildInputs = gtkNativeInputs; }; dashboard = attrs: { nativeBuildInputs = gtkNativeInputs; };
fitnesstrax = attrs: { nativeBuildInputs = gtkNativeInputs; }; fitnesstrax = import ./fitnesstrax/app/override.nix { gtkNativeInputs = gtkNativeInputs; };
}; };
}; };