diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-21 19:59:56 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-21 19:59:56 +0200 |
commit | 23be4a8b4de7790f48998d245a3ff5fe549e0f2b (patch) | |
tree | 40288abd6f0a9b2cbcbb7d209dc4ddf0610c8d15 /pkgs/tools/networking | |
parent | bae8756c1a30e77bab3dee28b90b2b4e0c7de57c (diff) | |
parent | ec21df329aef9b299dcedd46cc5901c670ac2726 (diff) | |
download | nixlib-23be4a8b4de7790f48998d245a3ff5fe549e0f2b.tar nixlib-23be4a8b4de7790f48998d245a3ff5fe549e0f2b.tar.gz nixlib-23be4a8b4de7790f48998d245a3ff5fe549e0f2b.tar.bz2 nixlib-23be4a8b4de7790f48998d245a3ff5fe549e0f2b.tar.lz nixlib-23be4a8b4de7790f48998d245a3ff5fe549e0f2b.tar.xz nixlib-23be4a8b4de7790f48998d245a3ff5fe549e0f2b.tar.zst nixlib-23be4a8b4de7790f48998d245a3ff5fe549e0f2b.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/ferm/default.nix | 20 | ||||
-rw-r--r-- | pkgs/tools/networking/mu/default.nix | 4 |
2 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix index 8fcdeb234ec3..855a57b7720f 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 ''; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index ae1ca3f77611..aa1e004d1afc 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preConfigure = "./autogen.sh"; - preBuild = '' # Fix mu4e-builddir (set it to $out) substituteInPlace mu4e/mu4e-meta.el.in \ @@ -43,7 +41,7 @@ stdenv.mkDerivation rec { description = "A collection of utilties for indexing and searching Maildirs"; license = licenses.gpl3Plus; homepage = "https://www.djcbsoftware.nl/code/mu/"; - platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ antono the-kenny peterhoeg ]; + platforms = platforms.mesaPlatforms; }; } |