Commit c1295e61 authored by OPNA2608's avatar OPNA2608
Browse files

mir: 2.17.2 -> 2.18.0

parent 443e1337

pkgs/servers/mir/common.nix

+27 −23
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
  glib,

  glm,

  glog,

  libapparmor,

  libdrm,

  libepoxy,

  libevdev,
@@ -58,7 +59,8 @@ stdenv.mkDerivation (finalAttrs: { 


  inherit patches;



  postPatch = ''

  postPatch =

    ''

      # Fix scripts that get run in tests

      patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in
@@ -74,6 +76,8 @@ stdenv.mkDerivation (finalAttrs: { 
      # Fix Xwayland default

      substituteInPlace src/miral/x11_support.cpp \

        --replace-fail '/usr/bin/Xwayland' '${lib.getExe xwayland}'

    ''

    + lib.optionalString (lib.strings.versionOlder version "2.18.0") ''



      # Fix paths for generating drm-formats

      substituteInPlace src/platform/graphics/CMakeLists.txt \
@@ -127,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { 
    xorg.libXcursor

    xorg.xorgproto

    xwayland

  ];

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



  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.17.2";

    hash = "sha256-OwOGt3X7+UchksyPf/sodit2PHpSlpP2S3gkCPcdzfE=";

    version = "2.18.0";

    hash = "sha256-Sy7sDlOP34M9zyNorX0loP21B/dd/7Zew8wcuEcjjUY=";

  };



  mir_2_15 = common {