alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

strongswan: 5.7.1 -> 5.7.2

Browse source
This commit is contained in:
Nikola Knezevic 2019-03-08 14:16:15 +01:00
parent 9fa52ae9a2
commit 81042e810f
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/tools/networking/strongswan/default.nix
View file

@ -19,11 +19,11 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "strongswan-${version}"; name = "strongswan-${version}";
version = "5.7.1"; version = "5.7.2";
src = fetchurl { src = fetchurl {
url = "https://download.strongswan.org/${name}.tar.bz2"; url = "https://download.strongswan.org/${name}.tar.bz2";
sha256 = "1v2b8lnqrkbc9hx3p2rw36xvphdy5ayy3dblm3kz98p24s8rqvq0"; sha256 = "0w6cks42lvvyj5ivyhqyqxya48x93yzfpz281q3xmqicdskkp3ih";
}; };
dontPatchELF = true; dontPatchELF = true;
@ -49,14 +49,7 @@ stdenv.mkDerivation rec {
})) }))
]; ];
postPatch = '' postPatch = optionalString stdenv.isLinux ''
# swanctl can be configured by files in SWANCTLDIR which defaults to
# $out/etc/swanctl. Since that directory is in the nix store users can't
# modify it. Ideally swanctl accepts a command line option for specifying
# the configuration files. In the absence of that we patch swanctl to look
# for configuration files in /etc/swanctl.
substituteInPlace src/swanctl/swanctl.h --replace "SWANCTLDIR" "\"/etc/swanctl\""
'' + optionalString stdenv.isLinux ''
# glibc-2.26 reorganized internal includes # glibc-2.26 reorganized internal includes
sed '1i#include <stdint.h>' -i src/libstrongswan/utils/utils/memory.h sed '1i#include <stdint.h>' -i src/libstrongswan/utils/utils/memory.h