Skip to content
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

Jump to bottom

Fix nix build #290

Merged
merged 3 commits into from
Jun 10, 2024
Merged

Fix nix build #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e6d48c
Fix deprecation warning.
r-vdp Jun 10, 2024
f83c16a
Fix nix build
r-vdp Jun 10, 2024
0c4c2f3
flake.lock: Update
r-vdp Jun 10, 2024
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
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

193 changes: 100 additions & 93 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,101 +18,108 @@
, ...
}@inputs:
{
overlays.default = final: prev: {
myceliumd =
let
craneLib = crane.lib.${final.system};

inherit (final) lib stdenv darwin;

manifest = builtins.fromTOML (lib.readFile ./myceliumd/Cargo.toml);

sourceRoot = "./myceliumd";
in
lib.makeOverridable craneLib.buildPackage {
src = nix-filter {
root = ./.;

# If no include is passed, it will include all the paths.
include = [
./Cargo.toml
./Cargo.lock
./mycelium
./myceliumd
./myceliumd-private
./mobile
overlays.default = final: prev:
let
inherit (final) lib stdenv darwin;
craneLib = crane.mkLib final;
in
{
myceliumd =
let
cargoToml = ./myceliumd/Cargo.toml;
cargoLock = ./myceliumd/Cargo.lock;
manifest = craneLib.crateNameFromCargoToml { inherit cargoToml; };
in
lib.makeOverridable craneLib.buildPackage {
src = nix-filter {
root = ./.;

# If no include is passed, it will include all the paths.
include = [
./Cargo.toml
./Cargo.lock
./mycelium
./mycelium-api
./mycelium-cli
./mycelium-metrics
./myceliumd
./myceliumd-private
./mobile
];
};

inherit (manifest) pname version;
inherit cargoToml cargoLock;
sourceRoot = "source/myceliumd";

doCheck = false;

nativeBuildInputs = [
final.pkg-config
# openssl base library
final.openssl
# required by openssl-sys
final.perl
];
};
pname = manifest.package.name;
inherit (manifest.package) version;

doCheck = false;

nativeBuildInputs = [
final.pkg-config
# openssl base library
final.openssl
# required by openssl-sys
final.perl
];

buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
final.libiconv
];

meta = {
mainProgram = "mycelium";
};
};
mycelium-private =
let
craneLib = crane.lib.${final.system};

inherit (final) lib stdenv darwin;

manifest = builtins.fromTOML (lib.readFile ./myceliumd-private/Cargo.toml);

sourceRoot = "./myceliumd-private";
in
lib.makeOverridable craneLib.buildPackage {
src = nix-filter {
root = ./.;

include = [
./Cargo.toml
./Cargo.lock
./mycelium
./myceliumd
./myceliumd-private
./mobile

buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
final.libiconv
];

meta = {
mainProgram = "mycelium";
};
};
pname = manifest.package.name;
inherit (manifest.package) version;

doCheck = false;

nativeBuildInputs = [
final.pkg-config
# openssl base library
final.openssl
# required by openssl-sys
final.perl
];

buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
final.libiconv
];

meta = {
mainProgram = "mycelium-private";
myceliumd-private =
let
cargoToml = ./myceliumd-private/Cargo.toml;
cargoLock = ./myceliumd-private/Cargo.lock;
manifest = craneLib.crateNameFromCargoToml { inherit cargoToml; };
in
lib.makeOverridable craneLib.buildPackage {
src = nix-filter {
root = ./.;

include = [
./Cargo.toml
./Cargo.lock
./mycelium
./mycelium-api
./mycelium-cli
./mycelium-metrics
./myceliumd
./myceliumd-private
./mobile
];
};

inherit (manifest) pname version;
inherit cargoToml cargoLock;
sourceRoot = "source/myceliumd-private";

doCheck = false;

nativeBuildInputs = [
final.pkg-config
# openssl base library
final.openssl
# required by openssl-sys
final.perl
];

buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
final.libiconv
];

meta = {
mainProgram = "mycelium-private";
};
};
};
};
};
} //
flake-utils.lib.eachSystem
[
Expand Down Expand Up @@ -140,9 +147,9 @@
};

packages = {
default = self.packages.${system}.mycelium;
default = self.packages.${system}.myceliumd;

inherit (pkgs) mycelium;
inherit (pkgs) myceliumd myceliumd-private;
};
});
}
Loading