Merge pull request #335772 from OPNA2608/update/miracle-wm
miracle-wm: 0.3.0 -> 0.3.2, fix build
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
gitUpdater,
|
||||
nixosTests,
|
||||
boost,
|
||||
@@ -19,20 +20,30 @@
|
||||
nlohmann_json,
|
||||
pcre2,
|
||||
pkg-config,
|
||||
wayland,
|
||||
yaml-cpp,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "miracle-wm";
|
||||
version = "0.3.0";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattkae";
|
||||
repo = "miracle-wm";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ss93yI33e+XFjbKedbBjmYHkjPeWUWxEStwNTgTszA4=";
|
||||
hash = "sha256-T5KDnUy/+wRL74v48i3D1OQrHuIoI1WUeybx9D7y+8Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove when https://github.com/mattkae/miracle-wm/pull/211 merged & in release
|
||||
(fetchpatch {
|
||||
name = "0001-miracle-wm-Dont-ignore-PKG_CONFIG_PATH.patch";
|
||||
url = "https://github.com/mattkae/miracle-wm/commit/a9fe6ed1e7dc605f72e18cdc2d19afb3c187be3a.patch";
|
||||
hash = "sha256-zzOwqUjyZGYIy/3BvOiedfCubrqaeglvsAzTXyq3wYU=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch =
|
||||
''
|
||||
substituteInPlace session/usr/local/share/wayland-sessions/miracle-wm.desktop.in \
|
||||
@@ -66,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mir
|
||||
nlohmann_json
|
||||
pcre2
|
||||
wayland
|
||||
yaml-cpp
|
||||
];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user