diff --git a/Cargo.lock b/Cargo.lock index 6bf9537..6a33e73 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -936,7 +936,7 @@ checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" [[package]] name = "fitnesstrax" -version = "0.4.0" +version = "0.4.1" dependencies = [ "async-channel", "async-trait", diff --git a/fitnesstrax/app/Cargo.toml b/fitnesstrax/app/Cargo.toml index 64a1e2b..dded4a7 100644 --- a/fitnesstrax/app/Cargo.toml +++ b/fitnesstrax/app/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fitnesstrax" -version = "0.4.0" +version = "0.4.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/fitnesstrax/app/override.nix b/fitnesstrax/app/override.nix new file mode 100644 index 0000000..fe83c85 --- /dev/null +++ b/fitnesstrax/app/override.nix @@ -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} + ) + ''; +} \ No newline at end of file diff --git a/flake.nix b/flake.nix index 70bc31b..9cd6153 100644 --- a/flake.nix +++ b/flake.nix @@ -58,6 +58,7 @@ pkgs.pkg-config pkgs.gtk4 pkgs.libadwaita + pkgs.wrapGAppsHook4 ]; cargoOverrides = pkgs: pkgs.buildRustCrate.override { @@ -68,7 +69,7 @@ libadwaita-sys = attrs: { nativeBuildInputs = gtkNativeInputs; }; dashboard = attrs: { nativeBuildInputs = gtkNativeInputs; }; - fitnesstrax = attrs: { nativeBuildInputs = gtkNativeInputs; }; + fitnesstrax = import ./fitnesstrax/app/override.nix { gtkNativeInputs = gtkNativeInputs; }; }; };