0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00

networkmanager: Remove unnecessary patching out of python_path

It builds without it nowadays.

Possibly thanks to 9158f4165f
This commit is contained in:
Jan Tojnar 2025-03-23 16:55:15 +01:00
parent b938d655f3
commit dfbe6c80a6
2 changed files with 0 additions and 62 deletions

View file

@ -134,8 +134,6 @@ stdenv.mkDerivation (finalAttrs: {
gnused
;
inherit runtimeShell;
# patch context
OUTPUT = null;
})
# Meson does not support using different directories during build and

View file

@ -31,26 +31,6 @@ index f3441508ab..7cde8d7d39 100644
log_domain = LOGD_IP6;
}
}
diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
index 3dd2338a82..de75cc040b 100644
--- a/src/libnm-client-impl/meson.build
+++ b/src/libnm-client-impl/meson.build
@@ -190,7 +190,6 @@ if enable_introspection
input: [gen_infos_cmd, libnm_gir[0]] + libnm_core_settings_sources,
output: 'nm-property-infos-' + name + '.xml',
command: [
- python_path,
gen_infos_cmd,
name,
'@OUTPUT@',
@@ -206,7 +205,6 @@ if enable_introspection
'env',
'GI_TYPELIB_PATH=' + gi_typelib_path,
'LD_LIBRARY_PATH=' + ld_library_path,
- python_path,
gen_gir_cmd,
'--lib-path', meson.current_build_dir(),
'--gir', libnm_gir[0],
diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c
index cbe76f5f1c..8515f94994 100644
--- a/src/libnmc-base/nm-vpn-helpers.c
@ -88,43 +68,3 @@ index cbe76f5f1c..8515f94994 100644
oc_argv[oc_argc++] = path;
oc_argv[oc_argc++] = "--authenticate";
diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
index 4d5079dfb3..5a15447fde 100644
--- a/src/libnmc-setting/meson.build
+++ b/src/libnmc-setting/meson.build
@@ -9,7 +9,6 @@ if enable_docs
input: [merge_cmd, nm_settings_docs_xml_gir['nmcli'], nm_property_infos_xml['nmcli']],
output: 'settings-docs-input.xml',
command: [
- python_path,
merge_cmd,
'@OUTPUT@',
nm_property_infos_xml['nmcli'],
@@ -23,7 +22,6 @@ if enable_docs
input: [gen_cmd, settings_docs_input_xml],
output: 'settings-docs.h',
command: [
- python_path,
gen_cmd,
'--output', '@OUTPUT@',
'--xml', settings_docs_input_xml
diff --git a/src/tests/client/meson.build b/src/tests/client/meson.build
index 5686a1c174..cfb6649a21 100644
--- a/src/tests/client/meson.build
+++ b/src/tests/client/meson.build
@@ -6,7 +6,6 @@ test(
args: [
build_root,
source_root,
- python_path,
'--',
'TestNmcli',
],
@@ -23,7 +22,6 @@ if enable_nm_cloud_setup
args: [
build_root,
source_root,
- python_path,
'--',
'TestNmCloudSetup',
],