diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2020-04-13 17:37:57 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-04-21 19:48:29 +0200 |
| commit | b1e93ddf4dc49bdfb3e545f25f6896a44fe70063 (patch) | |
| tree | b9b021f55196f15f43c7237402c9e26809006fde | |
| parent | b4a7b66d829afee50aef67fc641d79d6ed1001ab (diff) | |
| download | nixpkgs-b1e93ddf4dc49bdfb3e545f25f6896a44fe70063.tar nixpkgs-b1e93ddf4dc49bdfb3e545f25f6896a44fe70063.tar.gz nixpkgs-b1e93ddf4dc49bdfb3e545f25f6896a44fe70063.tar.bz2 nixpkgs-b1e93ddf4dc49bdfb3e545f25f6896a44fe70063.tar.lz nixpkgs-b1e93ddf4dc49bdfb3e545f25f6896a44fe70063.tar.xz nixpkgs-b1e93ddf4dc49bdfb3e545f25f6896a44fe70063.tar.zst nixpkgs-b1e93ddf4dc49bdfb3e545f25f6896a44fe70063.zip | |
ferm: 2.4.1 -> 2.5.1
| -rw-r--r-- | pkgs/tools/networking/ferm/default.nix | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix index 8fcdeb234ec..855a57b7720 100644 --- a/pkgs/tools/networking/ferm/default.nix +++ b/pkgs/tools/networking/ferm/default.nix @@ -3,23 +3,27 @@ let inherit (stdenv.lib.versions) majorMinor; in stdenv.mkDerivation rec { - version = "2.5"; + version = "2.5.1"; pname = "ferm"; src = fetchurl { url = "http://ferm.foo-projects.org/download/${majorMinor version}/ferm-${version}.tar.xz"; - sha256 = "0lxqcpirphihpvdqrh5kq0621aqq0h2vdy9q2v85gqdhd52js20p"; + sha256 = "0awl9s243sxgayr2fcmfks8xydhrmb9gy8bd9sfq738dgq7vybjb"; }; - buildInputs = [ perl ipset ebtables iptables makeWrapper ]; - preConfigure = '' - substituteInPlace config.mk --replace "PERL = /usr/bin/perl" "PERL = ${perl}/bin/perl" - substituteInPlace config.mk --replace "PREFIX = /usr" "PREFIX = $out" - ''; + # perl is used at build time to gather the ferm version. + nativeBuildInputs = [ makeWrapper perl ]; + buildInputs = [ perl ]; + + makeFlags = [ + "PERL=perl" + "PREFIX=${placeholder "out"}" + ]; + postInstall = '' rm -r $out/lib/systemd for i in "$out/sbin/"*; do - wrapProgram "$i" --prefix PATH : "${iptables}/bin:${ipset}/bin:${ebtables}/bin" + wrapProgram "$i" --prefix PATH : "${stdenv.lib.makeBinPath [ iptables ipset ebtables ]}" done ''; |