nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-15 11:50:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

mir: 2.28.0 -> 2.29.0 (#560982)

Browse Source
This commit is contained in:
Vladimír Čunát
2026-09-11 18:06:26 +00:00
committed by GitHub
parent eaad089433 0546b2fce2
commit 7a06dbfc59
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/by-name/mi/miracle-wm/package.nix
View File

@@ -2,6 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
fetchpatch,
gitUpdater,
nixosTests,
boost,
@@ -45,7 +46,21 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-htFgvXYgxQXV2U3F+tXEoaTb0udc2H1aHsIg5E8nRL8=";
};
patches = [
# Mir 2.29 compat, remove when version > 0.10.1
(fetchpatch {
name = "0001-miracle-wm-remove-legacy-mir-optional-usage.patch";
url = "https://github.com/miracle-wm-org/miracle-wm/commit/a4d7b21e0d25667cd270d7ff52f8dccc2a217796.patch";
hash = "sha256-XBbYSuXUOS9Gbs/LwxbbTAVsFuH8xLj8VhoCAjmCDfQ=";
})
];
# Mir 2.29 compat, remove when version > 0.10.1 (97a40cd8879898062b2cf7b5d1f5252ffc3b8dce is more than just a compat change)
postPatch = ''
substituteInPlace src/policy.{cpp,h} \
--replace-fail 'handle_raise_window' 'handle_activate_window'
''
+ ''
substituteInPlace CMakeLists.txt \
--replace-fail 'DESTINATION lib' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}' \
--replace-fail '-march=native' '# -march=native'

6
pkgs/servers/mir/default.nix
View File

@@ -5,9 +5,9 @@ let
in
{
mir = common {
version = "2.28.0";
hash = "sha256-sSxV20loRXQfGWMI1zAzrAwww00bc/BQqJaFB8whH5E=";
cargoHash = "sha256-AHB4OYP2kU47EsutOxYa693pMLgyXuF1p+mLXg2cIGs=";
version = "2.29.0";
hash = "sha256-jh8Qgr/5Ht0eioLH9ES4M+jZr3RLKHg2YJXX5XzzwEA=";
cargoHash = "sha256-VQpLjoKlaoYaSfVVNjxDGJXSlIri4RwETaQJf8faqHQ=";
};
mir_2_15 = common {