git.iko.soy/typeable/nixpkgs
on master help sign in
ferm: 2.4.1 -> 2.5.1
commitb1e93ddf4dc49bdfb3e545f25f6896a44fe70063 authorJörg Thalheim <joerg@thalheim.io> dateMon 13 Apr 2020, 17:37 (7 years ago) parentb4a7b66
1 file changed+12−8
pkgs/tools/networking/ferm/default.nix+12−8
pkgs/tools/networking/ferm/default.nix+12−8
@@ -3,23 +3,27 @@
33let
44 inherit (stdenv.lib.versions) majorMinor;
55in stdenv.mkDerivation rec {
6− version = "2.5";
6+ version = "2.5.1";
77 pname = "ferm";
88
99 src = fetchurl {
1010 url = "http://ferm.foo-projects.org/download/${majorMinor version}/ferm-${version}.tar.xz";
11− sha256 = "0lxqcpirphihpvdqrh5kq0621aqq0h2vdy9q2v85gqdhd52js20p";
11+ sha256 = "0awl9s243sxgayr2fcmfks8xydhrmb9gy8bd9sfq738dgq7vybjb";
1212 };
1313
14− buildInputs = [ perl ipset ebtables iptables makeWrapper ];
15− preConfigure = ''
16− substituteInPlace config.mk --replace "PERL = /usr/bin/perl" "PERL = ${perl}/bin/perl"
17− substituteInPlace config.mk --replace "PREFIX = /usr" "PREFIX = $out"
18− '';
14+ # perl is used at build time to gather the ferm version.
15+ nativeBuildInputs = [ makeWrapper perl ];
16+ buildInputs = [ perl ];
17+
18+ makeFlags = [
19+ "PERL=perl"
20+ "PREFIX=${placeholder "out"}"
21+ ];
22+
1923 postInstall = ''
2024 rm -r $out/lib/systemd
2125 for i in "$out/sbin/"*; do
22− wrapProgram "$i" --prefix PATH : "${iptables}/bin:${ipset}/bin:${ebtables}/bin"
26+ wrapProgram "$i" --prefix PATH : "${stdenv.lib.makeBinPath [ iptables ipset ebtables ]}"
2327 done
2428 '';
2529