Skip to content

fix: littel fixups on floresta-build. #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaoleal merged 2 commits into from
Sep 29, 2026
Merged

fix: littel fixups on floresta-build. #65

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de6adc9
fix(floresta-build): drop the self-recursive passthru.overrideAttrs
jaoleal Sep 28, 2026
c29d196
fix(floresta-build): fetch the default source at evaluation time
jaoleal Sep 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions lib/floresta-build.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
pkgs ? import <nixpkgs> { },
lib ? pkgs.lib,
# Source tree every build defaults to; standalone imports fall back to
# the latest release tag.
defaultSrc ? pkgs.fetchFromGitHub {
owner = "getfloresta";
repo = "Floresta";
rev = "v0.9.1";
hash = "sha256-5dfE0Bd0yCDh7Kc0PsSXjBWLQ9WmNCCbropdXfK9YSk=";
# the v0.9.1 tag. Fetched at evaluation time rather than by a
# derivation: the version is read off its Cargo.toml, and a derivation
# cannot be built under `nix flake check --no-build`.
defaultSrc ? builtins.fetchTarball {
url = "https://github.com/getfloresta/Floresta/archive/v0.9.1.tar.gz";
sha256 = "sha256-5dfE0Bd0yCDh7Kc0PsSXjBWLQ9WmNCCbropdXfK9YSk=";
},
# Extra environment variables set on buildRustPackage (e.g. ANDROID_NDK_HOME)
extraEnvVars ? { },
Expand Down Expand Up @@ -322,7 +322,6 @@ let
passthru = {
inherit cfg pkgConfig;
override = newArgs: mkFloresta (cfg // newArgs);
overrideAttrs = f: (mkFloresta args).overrideAttrs f;
};
}
// extraEnvVars
Expand Down
Loading