Commit e81c7deb authored by OPNA2608's avatar OPNA2608
Browse files

mir_2_15: Fix build with Boost 1.89

parent b4fd7504

pkgs/servers/mir/common.nix

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

pkgs/servers/mir/default.nix

+17 −0
Original line number Diff line number Diff line
@@ -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=";

      })

    ];

  };

}