diff --git a/pkgs/servers/mir/common.nix b/pkgs/servers/mir/common.nix index fa19b6d35f01..b9e7c4e3a3f6 100644 --- a/pkgs/servers/mir/common.nix +++ b/pkgs/servers/mir/common.nix @@ -96,6 +96,14 @@ stdenv.mkDerivation ( substituteInPlace src/platform/graphics/CMakeLists.txt \ --replace-fail "/usr/include/drm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h" \ --replace-fail "/usr/include/libdrm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h" + '' + # Boost.System was deprecated & dropped + + lib.optionalString (lib.strings.versionOlder version "2.23.0") '' + substituteInPlace \ + tests/CMakeLists.txt \ + tests/unit-tests/CMakeLists.txt \ + tests/mir_test_framework/CMakeLists.txt \ + --replace-fail 'Boost::system' "" ''; strictDeps = true; diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index 4671f0ddca2c..86e5c791a886 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -110,6 +110,23 @@ in ]; hash = "sha256-gzLVQW9Z6y+s2D7pKtp0ondQrjkzZ5iUYhGDPqFXD5M="; }) + + # Drop deprecated & removed Boost.System + # Remove when version > 2.22.2 + (fetchpatch { + name = "0301-mir-Disable-boost_system.patch"; + url = "https://github.com/canonical/mir/commit/0261aa6ce700311ee2b8723294451cdade1bc219.patch"; + excludes = [ + # hunk errors + "tests/CMakeLists.txt" + "tests/mir_test_framework/CMakeLists.txt" + "tests/unit-tests/CMakeLists.txt" + + # doesn't exist + "tests/window_management_tests/CMakeLists.txt" + ]; + hash = "sha256-UqClQFHzA1th2P7NH67dMJtncw8n/ey9RlPD5Z3VPk0="; + }) ]; }; }