Unverified Commit dd27dcf0 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #245854 from OPNA2608/update/mir

parents 4c22001b ae7fb110

pkgs/development/tools/wlcs/default.nix

+2 −18
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
, lib

, gitUpdater

, fetchFromGitHub

, fetchpatch

, cmake

, pkg-config

, boost
@@ -12,25 +11,15 @@ 


stdenv.mkDerivation rec {

  pname = "wlcs";

  version = "1.5.0";

  version = "1.6.0";



  src = fetchFromGitHub {

    owner = "MirServer";

    repo = "wlcs";

    rev = "v${version}";

    hash = "sha256-QxmWxu+w77/WE5pGXMWXm+NP95QmYo2O8ltZYrgCIWw=";

    hash = "sha256-+YM5dT45p9wk0gJeATmhWDFJJMaUdcTfw8GLS/vMkw4=";

  };



  patches = [

    # Improves pkg-config paths even more

    # Remove when https://github.com/MirServer/wlcs/pull/260 merged & in a release

    (fetchpatch {

      name = "0001-wlcs-pkgsconfig-Use-better-path-concatenations.patch";

      url = "https://github.com/MirServer/wlcs/pull/260/commits/20f28d82fa4dfa6a6e27212dbd6b0f2e8a833c69.patch";

      hash = "sha256-m8zPD27JbX/vN2YQgNhcRsh/O+qLfvoeky5E5ZEeD1I=";

    })

  ];



  nativeBuildInputs = [

    cmake

    pkg-config
@@ -42,11 +31,6 @@ stdenv.mkDerivation rec { 
    wayland

  ];



  env.NIX_CFLAGS_COMPILE = toString [

    # Needed with GCC 12

    "-Wno-error=maybe-uninitialized"

  ];



  passthru.updateScript = gitUpdater {

    rev-prefix = "v";

  };

pkgs/servers/mir/default.nix

+2 −13
Original line number Diff line number Diff line 
{ stdenv

, lib

, fetchFromGitHub

, fetchpatch

, gitUpdater

, testers

, cmake
@@ -41,25 +40,15 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "mir";

  version = "2.13.0";

  version = "2.14.1";



  src = fetchFromGitHub {

    owner = "MirServer";

    repo = "mir";

    rev = "v${finalAttrs.version}";

    hash = "sha256-Ip8p4mjcgmZQJTU4MNvWkTTtSJc+cCL3x1mMDFlZrVY=";

    hash = "sha256-IEGeZVNxwzHn5GASCyjNuQsnCzzfQBHdC33MWVMeZws=";

  };



  patches = [

    # Fixes Mir being able to drop first input device on launch

    # Drop when https://github.com/MirServer/mir/issues/2837 fixed in a release

    (fetchpatch {

      name = "0001-mir-Simplify_probing_of_evdev_input_platform.patch";

      url = "https://github.com/MirServer/mir/commit/7787cfa721934bb43d3255218e7c92e700923fcb.patch";

      hash = "sha256-9C9qcmngd+K8EAcyOYUJFTdFDu1Nt1MM7Y9TRNOXFB4=";

    })

  ];



  postPatch = ''

    # Fix scripts that get run in tests

    patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in