forked from lix-project/lix
Compare commits
1 commit
remove-mak
...
main
Author | SHA1 | Date | |
---|---|---|---|
Qyriad | 9e1b0b04ad |
22
flake.nix
22
flake.nix
|
@ -196,24 +196,6 @@
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
# FIXME(Qyriad): remove this when the migration to Meson has been completed.
|
|
||||||
# NOTE: mesonBuildClang depends on mesonBuild depends on build to avoid OOMs
|
|
||||||
# on aarch64 builders caused by too many parallel compiler/linker processes.
|
|
||||||
mesonBuild = forAllSystems (
|
|
||||||
system:
|
|
||||||
(self.packages.${system}.nix.override { buildWithMeson = true; }).overrideAttrs (prev: {
|
|
||||||
buildInputs = prev.buildInputs ++ [ self.packages.${system}.nix ];
|
|
||||||
})
|
|
||||||
);
|
|
||||||
mesonBuildClang = forAllSystems (
|
|
||||||
system:
|
|
||||||
(nixpkgsFor.${system}.stdenvs.clangStdenvPackages.nix.override { buildWithMeson = true; })
|
|
||||||
.overrideAttrs
|
|
||||||
(prev: {
|
|
||||||
buildInputs = prev.buildInputs ++ [ self.hydraJobs.mesonBuild.${system} ];
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
# Perl bindings for various platforms.
|
# Perl bindings for various platforms.
|
||||||
perlBindings = forAllSystems (system: nixpkgsFor.${system}.native.nix.perl-bindings);
|
perlBindings = forAllSystems (system: nixpkgsFor.${system}.native.nix.perl-bindings);
|
||||||
|
|
||||||
|
@ -237,7 +219,6 @@
|
||||||
inherit (pkgs) build-release-notes;
|
inherit (pkgs) build-release-notes;
|
||||||
internalApiDocs = true;
|
internalApiDocs = true;
|
||||||
busybox-sandbox-shell = pkgs.busybox-sandbox-shell;
|
busybox-sandbox-shell = pkgs.busybox-sandbox-shell;
|
||||||
buildWithMeson = true;
|
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
nix.overrideAttrs (prev: {
|
nix.overrideAttrs (prev: {
|
||||||
|
@ -367,9 +348,6 @@
|
||||||
checks = forAllSystems (
|
checks = forAllSystems (
|
||||||
system:
|
system:
|
||||||
{
|
{
|
||||||
# FIXME(Qyriad): remove this when the migration to Meson has been completed.
|
|
||||||
mesonBuild = self.hydraJobs.mesonBuild.${system};
|
|
||||||
mesonBuildClang = self.hydraJobs.mesonBuildClang.${system};
|
|
||||||
binaryTarball = self.hydraJobs.binaryTarball.${system};
|
binaryTarball = self.hydraJobs.binaryTarball.${system};
|
||||||
perlBindings = self.hydraJobs.perlBindings.${system};
|
perlBindings = self.hydraJobs.perlBindings.${system};
|
||||||
nixpkgsLibTests = self.hydraJobs.tests.nixpkgsLibTests.${system};
|
nixpkgsLibTests = self.hydraJobs.tests.nixpkgsLibTests.${system};
|
||||||
|
|
|
@ -62,7 +62,7 @@
|
||||||
|
|
||||||
# FIXME(Qyriad): build Lix using Meson instead of autoconf and make.
|
# FIXME(Qyriad): build Lix using Meson instead of autoconf and make.
|
||||||
# This flag will be removed when the migration to Meson is complete.
|
# This flag will be removed when the migration to Meson is complete.
|
||||||
buildWithMeson ? false,
|
buildWithMeson ? true,
|
||||||
|
|
||||||
# Not a real argument, just the only way to approximate let-binding some
|
# Not a real argument, just the only way to approximate let-binding some
|
||||||
# stuff for argument defaults.
|
# stuff for argument defaults.
|
||||||
|
|
Loading…
Reference in a new issue