Skip to content

Commit dfbe6c8

Browse files
committed
networkmanager: Remove unnecessary patching out of python_path
It builds without it nowadays. Possibly thanks to https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/9158f4165f748bbf2f346dee0941f28d26392bdf
1 parent b938d65 commit dfbe6c8

File tree

2 files changed

+0
-62
lines changed

2 files changed

+0
-62
lines changed

pkgs/tools/networking/networkmanager/default.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ stdenv.mkDerivation (finalAttrs: {
134134
gnused
135135
;
136136
inherit runtimeShell;
137-
# patch context
138-
OUTPUT = null;
139137
})
140138

141139
# Meson does not support using different directories during build and

pkgs/tools/networking/networkmanager/fix-paths.patch

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,6 @@ index f3441508ab..7cde8d7d39 100644
3131
log_domain = LOGD_IP6;
3232
}
3333
}
34-
diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
35-
index 3dd2338a82..de75cc040b 100644
36-
--- a/src/libnm-client-impl/meson.build
37-
+++ b/src/libnm-client-impl/meson.build
38-
@@ -190,7 +190,6 @@ if enable_introspection
39-
input: [gen_infos_cmd, libnm_gir[0]] + libnm_core_settings_sources,
40-
output: 'nm-property-infos-' + name + '.xml',
41-
command: [
42-
- python_path,
43-
gen_infos_cmd,
44-
name,
45-
'@OUTPUT@',
46-
@@ -206,7 +205,6 @@ if enable_introspection
47-
'env',
48-
'GI_TYPELIB_PATH=' + gi_typelib_path,
49-
'LD_LIBRARY_PATH=' + ld_library_path,
50-
- python_path,
51-
gen_gir_cmd,
52-
'--lib-path', meson.current_build_dir(),
53-
'--gir', libnm_gir[0],
5434
diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c
5535
index cbe76f5f1c..8515f94994 100644
5636
--- a/src/libnmc-base/nm-vpn-helpers.c
@@ -88,43 +68,3 @@ index cbe76f5f1c..8515f94994 100644
8868

8969
oc_argv[oc_argc++] = path;
9070
oc_argv[oc_argc++] = "--authenticate";
91-
diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
92-
index 4d5079dfb3..5a15447fde 100644
93-
--- a/src/libnmc-setting/meson.build
94-
+++ b/src/libnmc-setting/meson.build
95-
@@ -9,7 +9,6 @@ if enable_docs
96-
input: [merge_cmd, nm_settings_docs_xml_gir['nmcli'], nm_property_infos_xml['nmcli']],
97-
output: 'settings-docs-input.xml',
98-
command: [
99-
- python_path,
100-
merge_cmd,
101-
'@OUTPUT@',
102-
nm_property_infos_xml['nmcli'],
103-
@@ -23,7 +22,6 @@ if enable_docs
104-
input: [gen_cmd, settings_docs_input_xml],
105-
output: 'settings-docs.h',
106-
command: [
107-
- python_path,
108-
gen_cmd,
109-
'--output', '@OUTPUT@',
110-
'--xml', settings_docs_input_xml
111-
diff --git a/src/tests/client/meson.build b/src/tests/client/meson.build
112-
index 5686a1c174..cfb6649a21 100644
113-
--- a/src/tests/client/meson.build
114-
+++ b/src/tests/client/meson.build
115-
@@ -6,7 +6,6 @@ test(
116-
args: [
117-
build_root,
118-
source_root,
119-
- python_path,
120-
'--',
121-
'TestNmcli',
122-
],
123-
@@ -23,7 +22,6 @@ if enable_nm_cloud_setup
124-
args: [
125-
build_root,
126-
source_root,
127-
- python_path,
128-
'--',
129-
'TestNmCloudSetup',
130-
],

0 commit comments

Comments
 (0)