From 20a6873b04e893d3be4dae842cebe87ab5425740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Sowa?= Date: Sat, 14 Dec 2024 14:14:34 +0100 Subject: [PATCH] schroot: fix boost includes --- .../sc/schroot/fix-boost-includes.patch | 37 +++++++++++++++++++ pkgs/by-name/sc/schroot/package.nix | 1 + 2 files changed, 38 insertions(+) create mode 100644 pkgs/by-name/sc/schroot/fix-boost-includes.patch diff --git a/pkgs/by-name/sc/schroot/fix-boost-includes.patch b/pkgs/by-name/sc/schroot/fix-boost-includes.patch new file mode 100644 index 000000000000..f07fd0c68ed3 --- /dev/null +++ b/pkgs/by-name/sc/schroot/fix-boost-includes.patch @@ -0,0 +1,37 @@ +diff --git a/sbuild/sbuild-chroot-config.cc b/sbuild/sbuild-chroot-config.cc +index 48f8edad..388e2cac 100644 +--- a/sbuild/sbuild-chroot-config.cc ++++ b/sbuild/sbuild-chroot-config.cc +@@ -32,6 +32,7 @@ + #include + + #include ++#include + + #include + #include +diff --git a/sbuild/sbuild-run-parts.cc b/sbuild/sbuild-run-parts.cc +index 23132601..48bd9d67 100644 +--- a/sbuild/sbuild-run-parts.cc ++++ b/sbuild/sbuild-run-parts.cc +@@ -30,6 +30,7 @@ + + #include + #include ++#include + + using boost::format; + using namespace sbuild; +diff --git a/sbuild/sbuild-util.cc b/sbuild/sbuild-util.cc +index b6af7e89..dde32b49 100644 +--- a/sbuild/sbuild-util.cc ++++ b/sbuild/sbuild-util.cc +@@ -35,8 +35,6 @@ + #include + #endif + +-#include +- + using namespace sbuild; + + namespace diff --git a/pkgs/by-name/sc/schroot/package.nix b/pkgs/by-name/sc/schroot/package.nix index a0e38b446bc6..ca012cc05f25 100644 --- a/pkgs/by-name/sc/schroot/package.nix +++ b/pkgs/by-name/sc/schroot/package.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation { ./no-pam-service.patch ./no-default-config.patch ./fix-absolute-paths.patch + ./fix-boost-includes.patch ]; nativeBuildInputs = [