summary refs log tree commit diff
path: root/pkgs/os-specific/linux/ebtables
diff options
context:
space:
mode:
authorJesper Geertsen Jonsson <yesbox@users.noreply.github.com>2020-03-02 18:14:18 +0100
committerJesper Geertsen Jonsson <yesbox@users.noreply.github.com>2021-01-18 20:27:17 +0100
commit1cb447c9615a0a3c40ce4a6679c589671cc5702a (patch)
tree7a77c62affc9c19591580fac6ecfdf40dc4c7137 /pkgs/os-specific/linux/ebtables
parenta6ff47644b28a0ef772b16fea5120517eaa931a3 (diff)
downloadnixpkgs-1cb447c9615a0a3c40ce4a6679c589671cc5702a.tar
nixpkgs-1cb447c9615a0a3c40ce4a6679c589671cc5702a.tar.gz
nixpkgs-1cb447c9615a0a3c40ce4a6679c589671cc5702a.tar.bz2
nixpkgs-1cb447c9615a0a3c40ce4a6679c589671cc5702a.tar.lz
nixpkgs-1cb447c9615a0a3c40ce4a6679c589671cc5702a.tar.xz
nixpkgs-1cb447c9615a0a3c40ce4a6679c589671cc5702a.tar.zst
nixpkgs-1cb447c9615a0a3c40ce4a6679c589671cc5702a.zip
ebtables: restore "legacy" commands
ebtables 2.0.11 renamed the ebtables commands
from "ebtables*" to "ebtables-legacy-*".

Of course this breaks legacy packages and scripts
that depends on the ebtables commands.

The idea behind this upstream change appears to be that
ebtables-nft replaces ebtables and distributions should
rename either the ebtables-legacy or ebtables-nft commands
to provide the ebtables commands.

For nix a better fit is for packages to specify either the
ebtables or the ebtables-nft package, while both packages
provide the same commands.

This patch restores the ebtables package so it functions again.
Diffstat (limited to 'pkgs/os-specific/linux/ebtables')
-rw-r--r--pkgs/os-specific/linux/ebtables/default.nix16
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/ebtables/default.nix b/pkgs/os-specific/linux/ebtables/default.nix
index 2045c4b112c..bca24d9c905 100644
--- a/pkgs/os-specific/linux/ebtables/default.nix
+++ b/pkgs/os-specific/linux/ebtables/default.nix
@@ -9,16 +9,22 @@ stdenv.mkDerivation rec {
     sha256 = "0apxgmkhsk3vxn9q3libxn3dgrdljrxyy4mli2gk49m7hi3na7xp";
   };
 
-  makeFlags =
-    [ "LIBDIR=$(out)/lib" "BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man"
-      "ETCDIR=$(out)/etc" "INITDIR=$(TMPDIR)" "SYSCONFIGDIR=$(out)/etc/sysconfig"
-      "LOCALSTATEDIR=/var"
-    ];
+  makeFlags = [
+    "LIBDIR=$(out)/lib" "BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man"
+    "ETCDIR=$(out)/etc" "INITDIR=$(TMPDIR)" "SYSCONFIGDIR=$(out)/etc/sysconfig"
+    "LOCALSTATEDIR=/var"
+  ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
   preInstall = "mkdir -p $out/etc/sysconfig";
 
+  postInstall = ''
+    ln -s $out/sbin/ebtables-legacy          $out/sbin/ebtables
+    ln -s $out/sbin/ebtables-legacy-restore  $out/sbin/ebtables-restore
+    ln -s $out/sbin/ebtables-legacy-save     $out/sbin/ebtables-save
+  '';
+
   meta = with lib; {
     description = "A filtering tool for Linux-based bridging firewalls";
     homepage = "http://ebtables.sourceforge.net/";