From ea168da721a097d9364b113b8352f0546fe50dff Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 7 Apr 2025 11:20:03 +0800 Subject: [PATCH] firewalld: add NIX_FIREWALLD_CONFIG_PATH --- .../fi/firewalld/add-config-path-env-var.patch | 12 ++++++++++++ pkgs/by-name/fi/firewalld/package.nix | 1 + 2 files changed, 13 insertions(+) create mode 100644 pkgs/by-name/fi/firewalld/add-config-path-env-var.patch diff --git a/pkgs/by-name/fi/firewalld/add-config-path-env-var.patch b/pkgs/by-name/fi/firewalld/add-config-path-env-var.patch new file mode 100644 index 000000000000..bba877e5593a --- /dev/null +++ b/pkgs/by-name/fi/firewalld/add-config-path-env-var.patch @@ -0,0 +1,12 @@ +--- a/src/firewall/config/__init__.py.in ++++ b/src/firewall/config/__init__.py.in +@@ -80,7 +80,8 @@ + FIREWALLD_POLICIES = path + "/policies" + + +-set_default_config_paths("/usr/lib/firewalld") ++import os ++set_default_config_paths(os.environ.get("NIX_FIREWALLD_CONFIG_PATH", "/usr/lib/firewalld")) + + FIREWALLD_LOGFILE = "/var/log/firewalld" + diff --git a/pkgs/by-name/fi/firewalld/package.nix b/pkgs/by-name/fi/firewalld/package.nix index 466e25285a91..f8606abb4757 100644 --- a/pkgs/by-name/fi/firewalld/package.nix +++ b/pkgs/by-name/fi/firewalld/package.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { }; patches = [ + ./add-config-path-env-var.patch ./respect-xml-catalog-files-var.patch ./specify-localedir.patch ];