Unverified Commit 8f7e9281 authored by Masum Reza's avatar Masum Reza Committed by GitHub
Browse files

bootc: add composefs support (#354498)

parents 2cdc73f2 3534991c

pkgs/by-name/bo/bootc/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/by-name/os/ostree-full/package.nix

0 → 100644
+7 −0
Original line number Diff line number Diff line 
{

  ostree,

}:



ostree.override {

  withComposefs = true;

}

pkgs/by-name/os/ostree/package.nix

+8 −0
Original line number Diff line number Diff line
@@ -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 = [