Merge pull request #206080 from jtojnar/mutter-fixup
gnome.mutter: Drop unneeded patch
This commit is contained in:
commit
99283ec794
|
@ -47,14 +47,14 @@
|
|||
, wayland-protocols
|
||||
}:
|
||||
|
||||
let self = stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mutter";
|
||||
version = "43.2";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "/S63B63DM8wnevhoXlzzkTXhxNeYofnQXojkU9w+u4Q=";
|
||||
};
|
||||
|
||||
|
@ -65,16 +65,6 @@ let self = stdenv.mkDerivation rec {
|
|||
url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch";
|
||||
sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU=";
|
||||
})
|
||||
|
||||
# Revert clutter optimization causing issues on X11
|
||||
# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2667
|
||||
# Will be replaced with a proper fix in 43.2
|
||||
# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6054
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/7e7a639cc5132cf3355e861235f325540fe56548.patch";
|
||||
sha256 = "NYoKCRh5o1Q15c11a79Hk5tGKq/jOa+e6GpgBjPEepo=";
|
||||
revert = true;
|
||||
})
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
@ -160,12 +150,12 @@ let self = stdenv.mkDerivation rec {
|
|||
separateDebugInfo = true;
|
||||
|
||||
passthru = {
|
||||
libdir = "${self}/lib/mutter-11";
|
||||
libdir = "${finalAttrs.finalPackage}/lib/mutter-11";
|
||||
|
||||
tests = {
|
||||
libdirExists = runCommand "mutter-libdir-exists" {} ''
|
||||
if [[ ! -d ${self.libdir} ]]; then
|
||||
echo "passthru.libdir should contain a directory, “${self.libdir}” is not one."
|
||||
if [[ ! -d ${finalAttrs.finalPackage.libdir} ]]; then
|
||||
echo "passthru.libdir should contain a directory, “${finalAttrs.finalPackage.libdir}” is not one."
|
||||
exit 1
|
||||
fi
|
||||
touch $out
|
||||
|
@ -173,8 +163,8 @@ let self = stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome.${pname}";
|
||||
packageName = "mutter";
|
||||
attrPath = "gnome.mutter";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -185,5 +175,4 @@ let self = stdenv.mkDerivation rec {
|
|||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
in self
|
||||
})
|
||||
|
|
Loading…
Reference in a new issue