swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

libreswan: use python3

Browse source
This commit is contained in:
Frederik Rietdijk 2021-03-26 09:13:11 +01:00
parent fe538efe61
commit ba6f1213f0
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/tools/networking/libreswan/default.nix
View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, { lib, stdenv, fetchurl, makeWrapper,
pkg-config, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr, 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 docs ? false, xmlto, libselinux, ldns
}: }:
let let
binPath = lib.makeBinPath [ 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 in
@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
sha256 = "0bj3g6qwd3ir3gk6hdl9npy3k44shf56vcgjahn30qpmx3z5fsr3"; sha256 = "0bj3g6qwd3ir3gk6hdl9npy3k44shf56vcgjahn30qpmx3z5fsr3";
}; };
strictDeps = true;
# These flags were added to compile v3.18. Try to lift them when updating. # 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" NIX_CFLAGS_COMPILE = toString [ "-Wno-error=redundant-decls" "-Wno-error=format-nonliteral"
# these flags were added to build with gcc7 # these flags were added to build with gcc7
@ -35,9 +37,15 @@ stdenv.mkDerivation rec {
"-DNSS_PKCS11_2_0_COMPAT=1" "-DNSS_PKCS11_2_0_COMPAT=1"
]; ];
nativeBuildInputs = [ makeWrapper pkg-config ]; nativeBuildInputs = [
buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent bison
libcap_ng curl nspr nss python ldns ] 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 docs xmlto
++ lib.optional stdenv.isLinux libselinux; ++ lib.optional stdenv.isLinux libselinux;