pyrox.dev
Merge pull request #136120 from rnhmjoj/libreswan
libreswan: 4.4 -> 4.5
authored by Michele Guerini Rocco and committed by GitHub b7e62ea8 78d20f22
+3
-14
pkgs/tools/networking/libreswan/default.nix
+3
-14
pkgs/tools/networking/libreswan/default.nix
···
1
1
{ lib
2
2
, stdenv
3
3
, fetchurl
4
-
, fetchpatch
5
4
, nixosTests
6
5
, pkg-config
7
6
, systemd
···
43
42
44
43
stdenv.mkDerivation rec {
45
44
pname = "libreswan";
46
-
version = "4.4";
45
+
version = "4.5";
47
46
48
47
src = fetchurl {
49
48
url = "https://download.libreswan.org/${pname}-${version}.tar.gz";
50
-
sha256 = "0xj974yc0y1r7235zl4jhvxqz3bpb8js2fy9ic820zq9swh0lgsz";
49
+
sha256 = "18whvmaxqfmaqbmq72calyzk21wyvxa0idddcsxd8x36vhdza0q7";
51
50
};
52
51
53
52
strictDeps = true;
···
70
69
python3 bash
71
70
] ++ lib.optional stdenv.isLinux libselinux;
72
71
73
-
patches = [
74
-
# Fix compilation on aarch64, remove on next update
75
-
(fetchpatch {
76
-
url = "https://github.com/libreswan/libreswan/commit/ea50d36d2886e44317ba5ba841de1d1bf91aee6c.patch";
77
-
sha256 = "1jp89rm9jp55zmiyimyhg7yadj0fwwxaw7i5gyclrs38w3y1aacj";
78
-
})
79
-
];
80
-
81
72
prePatch = ''
82
73
# Correct iproute2 path
83
74
sed -e 's|"/sbin/ip"|"${iproute2}/bin/ip"|' \
···
111
102
-i configs/Makefile
112
103
'';
113
104
114
-
# Set appropriate paths for build
115
-
preBuild = "export INC_USRLOCAL=\${out}";
116
-
117
105
makeFlags = [
106
+
"PREFIX=$(out)"
118
107
"INITSYSTEM=systemd"
119
108
"UNITDIR=$(out)/etc/systemd/system/"
120
109
"TMPFILESDIR=$(out)/lib/tmpfiles.d/"