mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-23 09:00:51 +00:00
bootc: add composefs support (#354498)
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
pkg-config,
|
||||
openssl,
|
||||
glib,
|
||||
ostree,
|
||||
ostree-full,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
|
||||
zstd
|
||||
openssl
|
||||
glib
|
||||
ostree
|
||||
ostree-full
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
|
||||
7
pkgs/by-name/os/ostree-full/package.nix
Normal file
7
pkgs/by-name/os/ostree-full/package.nix
Normal file
@@ -0,0 +1,7 @@
|
||||
{
|
||||
ostree,
|
||||
}:
|
||||
|
||||
ostree.override {
|
||||
withComposefs = true;
|
||||
}
|
||||
@@ -33,6 +33,10 @@
|
||||
, docbook-xsl-nons
|
||||
, docbook_xml_dtd_42
|
||||
, python3
|
||||
|
||||
# Optional ComposeFS support
|
||||
, withComposefs ? false
|
||||
, composefs
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -87,6 +91,8 @@ in stdenv.mkDerivation rec {
|
||||
# for installed tests
|
||||
testPython
|
||||
gjs
|
||||
] ++ lib.optionals withComposefs [
|
||||
(lib.getDev composefs)
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@@ -97,6 +103,8 @@ in stdenv.mkDerivation rec {
|
||||
"--with-systemdsystemgeneratordir=${placeholder "out"}/lib/systemd/system-generators"
|
||||
"--enable-installed-tests"
|
||||
"--with-ed25519-libsodium"
|
||||
] ++ lib.optionals withComposefs [
|
||||
"--with-composefs"
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
|
||||
Reference in New Issue
Block a user