diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2021-03-26 09:13:11 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2021-04-03 17:06:09 +0200 |
commit | ba6f1213f092aee58455a6f57f14cbf1257963dc (patch) | |
tree | 7ee54f63372fc9bc7cc0cec057ba5a5e695c5ea2 /pkgs/tools/networking/libreswan | |
parent | fe538efe61b1dc4eaea00d79a19a93fe21ead654 (diff) | |
download | nixpkgs-ba6f1213f092aee58455a6f57f14cbf1257963dc.tar nixpkgs-ba6f1213f092aee58455a6f57f14cbf1257963dc.tar.gz nixpkgs-ba6f1213f092aee58455a6f57f14cbf1257963dc.tar.bz2 nixpkgs-ba6f1213f092aee58455a6f57f14cbf1257963dc.tar.lz nixpkgs-ba6f1213f092aee58455a6f57f14cbf1257963dc.tar.xz nixpkgs-ba6f1213f092aee58455a6f57f14cbf1257963dc.tar.zst nixpkgs-ba6f1213f092aee58455a6f57f14cbf1257963dc.zip |
libreswan: use python3
Diffstat (limited to 'pkgs/tools/networking/libreswan')
-rw-r--r-- | pkgs/tools/networking/libreswan/default.nix | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 3546e1aa119..93d423a7283 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr, - bash, iproute, iptables, procps, coreutils, gnused, gawk, nss, which, python, + bash, iproute, iptables, procps, coreutils, gnused, gawk, nss, which, python3, docs ? false, xmlto, libselinux, ldns }: let binPath = lib.makeBinPath [ - bash iproute iptables procps coreutils gnused gawk nss.tools which python + bash iproute iptables procps coreutils gnused gawk nss.tools which python3 ]; in @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { sha256 = "0bj3g6qwd3ir3gk6hdl9npy3k44shf56vcgjahn30qpmx3z5fsr3"; }; + strictDeps = true; + # These flags were added to compile v3.18. Try to lift them when updating. NIX_CFLAGS_COMPILE = toString [ "-Wno-error=redundant-decls" "-Wno-error=format-nonliteral" # these flags were added to build with gcc7 @@ -35,9 +37,15 @@ stdenv.mkDerivation rec { "-DNSS_PKCS11_2_0_COMPAT=1" ]; - nativeBuildInputs = [ makeWrapper pkg-config ]; - buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent - libcap_ng curl nspr nss python ldns ] + nativeBuildInputs = [ + bison + flex + makeWrapper + pkg-config + ]; + + buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound pam libevent + libcap_ng curl nspr nss python3 ldns ] ++ lib.optional docs xmlto ++ lib.optional stdenv.isLinux libselinux; |