about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/nftables
diff options
context:
space:
mode:
authorLeorize <leorize+oss@disroot.org>2024-04-04 14:48:22 -0500
committerLeorize <leorize+oss@disroot.org>2024-04-14 18:45:40 -0500
commit9b8156b4a44c6577392e58d0cc728966e933c0b9 (patch)
tree320b06ffe350b69c549200e5f18883b7d92c5572 /pkgs/os-specific/linux/nftables
parente95a228693d2d60afa4715bb12945af092553705 (diff)
nftables: remove python patch
Replaced the patch with `--replace-fail` based on @quentinmit and
@Izorkin recommendation.
Diffstat (limited to 'pkgs/os-specific/linux/nftables')
-rw-r--r--pkgs/os-specific/linux/nftables/fix-py-libnftables.patch13
-rw-r--r--pkgs/os-specific/linux/nftables/python.nix4
2 files changed, 1 insertions, 16 deletions
diff --git a/pkgs/os-specific/linux/nftables/fix-py-libnftables.patch b/pkgs/os-specific/linux/nftables/fix-py-libnftables.patch
deleted file mode 100644
index 3ab1e5363019a..0000000000000
--- a/pkgs/os-specific/linux/nftables/fix-py-libnftables.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/py/src/nftables.py b/py/src/nftables.py
-index f1e43ade..9adcd1be 100644
---- a/py/src/nftables.py
-+++ b/py/src/nftables.py
-@@ -69,7 +69,7 @@ class Nftables:
- 
-     validator = None
- 
--    def __init__(self, sofile="libnftables.so.1"):
-+    def __init__(self, sofile="@out@/lib/libnftables.so.1"):
-         """Instantiate a new Nftables class object.
- 
-         Accepts a shared object file to open, by default standard search path
diff --git a/pkgs/os-specific/linux/nftables/python.nix b/pkgs/os-specific/linux/nftables/python.nix
index ea50e270d0861..5c5770ebed4a5 100644
--- a/pkgs/os-specific/linux/nftables/python.nix
+++ b/pkgs/os-specific/linux/nftables/python.nix
@@ -9,11 +9,9 @@ buildPythonPackage {
   inherit (nftables) version src;
   pyproject = true;
 
-  patches = [ ./fix-py-libnftables.patch ];
-
   postPatch = ''
     substituteInPlace "py/src/nftables.py" \
-      --subst-var-by "out" "${nftables}"
+      --replace-fail "libnftables.so.1" "${nftables}/lib/libnftables.so.1"
   '';
 
   setSourceRoot = "sourceRoot=$(echo */py)";