From 0feebd4a76451724f434662b12d184345e77c341 Mon Sep 17 00:00:00 2001
From: TheSola10 <me@thesola.io>
Date: Fri, 8 Nov 2024 15:12:23 +0100
Subject: [PATCH 1/2] ostree: add composefs support

---
 pkgs/by-name/os/ostree-full/package.nix | 7 +++++++
 pkgs/by-name/os/ostree/package.nix      | 8 ++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/by-name/os/ostree-full/package.nix

diff --git a/pkgs/by-name/os/ostree-full/package.nix b/pkgs/by-name/os/ostree-full/package.nix
new file mode 100644
index 000000000000..c1c4d952b7e3
--- /dev/null
+++ b/pkgs/by-name/os/ostree-full/package.nix
@@ -0,0 +1,7 @@
+{
+  ostree,
+}:
+
+ostree.override {
+  withComposefs = true;
+}
diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix
index dff3820b4112..3bed8333cb25 100644
--- a/pkgs/by-name/os/ostree/package.nix
+++ b/pkgs/by-name/os/ostree/package.nix
@@ -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 = [

From 3534991cf8db4988ddecc0b3a8e89b0f53f57179 Mon Sep 17 00:00:00 2001
From: TheSola10 <me@thesola.io>
Date: Fri, 8 Nov 2024 15:12:38 +0100
Subject: [PATCH 2/2] bootc: add composefs support

---
 pkgs/by-name/bo/bootc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bo/bootc/package.nix b/pkgs/by-name/bo/bootc/package.nix
index 164f428b4830..407864291e4d 100644
--- a/pkgs/by-name/bo/bootc/package.nix
+++ b/pkgs/by-name/bo/bootc/package.nix
@@ -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 = [