gnome3.mutter: enable profiler
This needed a patch to get the correct directory to the sysprof dbus interface.
This commit is contained in:
parent
b916c65706
commit
a821167046
|
@ -0,0 +1,25 @@
|
||||||
|
From 71acfd5258b4d12323fc51dda48e83830e62e696 Mon Sep 17 00:00:00 2001
|
||||||
|
From: worldofpeace <worldofpeace@protonmail.ch>
|
||||||
|
Date: Mon, 16 Sep 2019 11:18:27 -0400
|
||||||
|
Subject: [PATCH] build: use get_pkgconfig_variable for sysprof dbusdir
|
||||||
|
|
||||||
|
---
|
||||||
|
src/meson.build | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/meson.build b/src/meson.build
|
||||||
|
index 182f7f5f5..43060865b 100644
|
||||||
|
--- a/src/meson.build
|
||||||
|
+++ b/src/meson.build
|
||||||
|
@@ -710,7 +710,7 @@ if have_profiler
|
||||||
|
'backends/meta-profiler.h',
|
||||||
|
]
|
||||||
|
|
||||||
|
- dbus_interfaces_dir = join_paths(datadir, 'dbus-1', 'interfaces')
|
||||||
|
+ dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('prefix'), 'share', 'dbus-1', 'interfaces')
|
||||||
|
sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml')
|
||||||
|
|
||||||
|
dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler',
|
||||||
|
--
|
||||||
|
2.22.1
|
||||||
|
|
|
@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
"-Dxwayland-path=${xwayland}/bin/Xwayland"
|
"-Dxwayland-path=${xwayland}/bin/Xwayland"
|
||||||
"-Dinstalled_tests=false" # TODO: enable these
|
"-Dinstalled_tests=false" # TODO: enable these
|
||||||
"-Dprofiler=false"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -51,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||||
geocode-glib libinput libgudev libwacom
|
geocode-glib libinput libgudev libwacom
|
||||||
libcanberra-gtk3 zenity xkeyboard_config libxkbfile
|
libcanberra-gtk3 zenity xkeyboard_config libxkbfile
|
||||||
libxkbcommon pipewire xwayland
|
libxkbcommon pipewire xwayland
|
||||||
gnome-settings-daemon # sysprof
|
gnome-settings-daemon sysprof
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -60,6 +59,8 @@ stdenv.mkDerivation rec {
|
||||||
url = "https://gitlab.gnome.org/GNOME/mutter/commit/850ef518795dcc20d3b9a4f661f70ff8d0ddacb2.patch";
|
url = "https://gitlab.gnome.org/GNOME/mutter/commit/850ef518795dcc20d3b9a4f661f70ff8d0ddacb2.patch";
|
||||||
sha256 = "0cxdbrbcc8kfkvw7ryxjm2v1vk15jki7bawn128385r5hasabhxf";
|
sha256 = "0cxdbrbcc8kfkvw7ryxjm2v1vk15jki7bawn128385r5hasabhxf";
|
||||||
})
|
})
|
||||||
|
# TODO: submit upstream
|
||||||
|
./0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch
|
||||||
(substituteAll {
|
(substituteAll {
|
||||||
src = ./fix-paths.patch;
|
src = ./fix-paths.patch;
|
||||||
inherit zenity;
|
inherit zenity;
|
||||||
|
|
Loading…
Reference in New Issue