diff options
| author | OPNA2608 <christoph.neidahl@gmail.com> | 2023-03-20 15:51:06 +0100 |
|---|---|---|
| committer | OPNA2608 <christoph.neidahl@gmail.com> | 2023-04-23 22:08:11 +0200 |
| commit | b83ad894b9c0665336fe5290702e995005d7fe90 (patch) | |
| tree | fead3bb02837c608eb7473f3e0164425b085eaa4 /pkgs/servers/mir/default.nix | |
| parent | 829ddb2c750a77c51346c182016f15a903bde524 (diff) | |
mir: 2.12.1 -> 2.13.0
Diffstat (limited to 'pkgs/servers/mir/default.nix')
| -rw-r--r-- | pkgs/servers/mir/default.nix | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index b187a1d642453..45c9efc7b2caa 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , gitUpdater , cmake , pkg-config @@ -49,26 +48,15 @@ in stdenv.mkDerivation rec { pname = "mir"; - version = "2.12.1"; + version = "2.13.0"; src = fetchFromGitHub { owner = "MirServer"; repo = "mir"; rev = "v${version}"; - hash = "sha256-c9lFlzoxj45Xx5FYd0O/arVCV9ilArzj5GrPuJigJ4E="; + hash = "sha256-Ip8p4mjcgmZQJTU4MNvWkTTtSJc+cCL3x1mMDFlZrVY="; }; - patches = [ - # Fixes various path concatenation problems and missing GNUInstallDirs variable uses that affect - # install locations and generated pkg-config files - # Remove when a version > 2.12.1 has the fixes - (fetchpatch { - name = "0001-mir-Better-install-path-concatenations-and-more-GNUInstallDirs-variables.patch"; - url = "https://github.com/MirServer/mir/commit/58c4ca628748278b1eb7a3721ad9a0c3590e28f2.patch"; - hash = "sha256-+FNVlApaVzA94cy4awulLwTtggD07xACbvjII/RxyRM="; - }) - ]; - postPatch = '' # Fix scripts that get run in tests patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in |