pyrox.dev
Merge pull request #303639 from r-vdp/dbus-broker-36
dbus-broker: 35 -> 36
authored by Pol Dellaiera and committed by GitHub 193b257c b4bcfd11
+2
-2
pkgs/os-specific/linux/dbus-broker/default.nix
+2
-2
pkgs/os-specific/linux/dbus-broker/default.nix
···
40
40
41
41
stdenv.mkDerivation (finalAttrs: {
42
42
pname = "dbus-broker";
43
-
version = "35";
43
+
version = "36";
44
44
45
45
src = fetchFromGitHub {
46
46
owner = "bus1";
47
47
repo = "dbus-broker";
48
48
rev = "v${finalAttrs.version}";
49
-
hash = "sha256-Qwi9X5jXHiQ3TOWefzv/p7x8/JkQW1QgdYji5SpLej0=";
49
+
hash = "sha256-5dAMKjybqrHG57vArbtWEPR/svSj2ION75JrjvnnpVM=";
50
50
};
51
51
52
52
patches = [
+13
-10
pkgs/os-specific/linux/dbus-broker/disable-test.patch
+13
-10
pkgs/os-specific/linux/dbus-broker/disable-test.patch
···
1
-
--- b/src/meson.build
2
-
+++ a/src/meson.build
3
-
@@ -196,9 +195,6 @@
4
-
test_fdlist = executable('test-fdlist', ['util/test-fdlist.c'], dependencies: dep_bus)
5
-
test('Utility File-Desciptor Lists', test_fdlist)
6
-
7
-
-test_fs = executable('test-fs', ['util/test-fs.c'], dependencies: dep_bus)
8
-
-test('File System Helpers', test_fs)
1
+
diff --git a/src/meson.build b/src/meson.build
2
+
index 4b9bc71..221ed5c 100644
3
+
--- a/src/meson.build
4
+
+++ b/src/meson.build
5
+
@@ -202,9 +202,6 @@ test('Error Handling', test_error, suite: 'unit')
6
+
test_fdlist = executable('test-fdlist', sources: ['util/test-fdlist.c'], kwargs: test_kwargs)
7
+
test('Utility File-Desciptor Lists', test_fdlist, suite: 'unit')
8
+
9
+
-test_fs = executable('test-fs', sources: ['util/test-fs.c'], kwargs: test_kwargs)
10
+
-test('File System Helpers', test_fs, suite: 'unit')
9
11
-
10
-
test_match = executable('test-match', ['bus/test-match.c'], dependencies: dep_bus)
11
-
test('D-Bus Match Handling', test_match)
12
+
test_match = executable('test-match', sources: ['bus/test-match.c'], kwargs: test_kwargs)
13
+
test('D-Bus Match Handling', test_match, suite: 'unit')
14
+