Commit a9633d81 authored by OPNA2608's avatar OPNA2608
Browse files

mir: 2.20.2 -> 2.21.0

parent 8c34fc8c

pkgs/servers/mir/common.nix

+34 −26
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
  lttng-ust,

  libgbm,

  nettle,

  pixman,

  udev,

  wayland,

  wayland-scanner,
@@ -105,7 +106,8 @@ stdenv.mkDerivation (finalAttrs: { 
    wayland-scanner

  ];



  buildInputs = [

  buildInputs =

    [

      boost

      egl-wayland

      freetype
@@ -130,7 +132,13 @@ stdenv.mkDerivation (finalAttrs: { 
      xorg.libXcursor

      xorg.xorgproto

      xwayland

  ] ++ lib.optionals (lib.strings.versionAtLeast version "2.18.0") [ libapparmor ];

    ]

    ++ lib.optionals (lib.strings.versionAtLeast version "2.18.0") [

      libapparmor

    ]

    ++ lib.optionals (lib.strings.versionAtLeast version "2.21.0") [

      pixman

    ];



  nativeCheckInputs = [

    dbus

pkgs/servers/mir/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ let 
in

{

  mir = common {

    version = "2.20.2";

    hash = "sha256-kxXPRIvgvpWqos8l/fJyHvfJBNi0jOZfV5inY3SBavM=";

    version = "2.21.0";

    hash = "sha256-WCVh1163ZmT8tHe60AOxSg7AEDXsSekNb7UpbojyIXU=";

  };



  mir_2_15 = common {