public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

networkmanager_strongswan: 1.4.3 → 1.4.4

Browse Source
This commit is contained in:
Jan Tojnar 2018-08-09 17:24:34 +02:00
parent 87cf73bd1a
commit 86254f07b8
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/tools/networking/network-manager/strongswan.nix
View File

@ -1,38 +1,35 @@
{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM, sysctl { stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM
, gnome3, libgnome-keyring, libsecret }: , gnome3, libsecret }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "NetworkManager-strongswan"; pname = "NetworkManager-strongswan";
version = "1.4.3"; version = "1.4.4";
src = fetchurl { src = fetchurl {
url = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2"; url = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2";
sha256 = "0jzl52wmh2q2djb1s546kxliy7s6akhi5bx6rp2ppjfk3wbi2a2l"; sha256 = "1xhj5cipwbihf0cna8lpicpz7cd8fgkagpmg0xvj6pshymm5jbcd";
}; };
postPatch = ''
sed -i "s,nm_plugindir=.*,nm_plugindir=$out/lib/NetworkManager," "configure"
sed -i "s,nm_libexecdir=.*,nm_libexecdir=$out/libexec," "configure"
'';
buildInputs = [ networkmanager strongswanNM libsecret ] buildInputs = [ networkmanager strongswanNM libsecret ]
++ (with gnome3; [ gtk libgnome-keyring networkmanagerapplet ]); ++ (with gnome3; [ gtk networkmanagerapplet ]);
nativeBuildInputs = [ intltool pkgconfig ]; nativeBuildInputs = [ intltool pkgconfig ];
# Fixes deprecation errors with networkmanager 1.10.2 # Fixes deprecation errors with networkmanager 1.10.2
NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
preConfigure = '' configureFlags = [
substituteInPlace "configure" \ "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm"
--replace "/sbin/sysctl" "${sysctl}/bin/sysctl" "--with-nm-libexecdir=$(out)/libexec"
''; "--with-nm-plugindir=$(out)/lib/NetworkManager"
];
configureFlags = [ "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" ]; PKG_CONFIG_LIBNM_VPNSERVICEDIR = "$(out)/lib/NetworkManager/VPN";
meta = { meta = with stdenv.lib; {
description = "NetworkManager's strongswan plugin"; description = "NetworkManager's strongswan plugin";
inherit (networkmanager.meta) platforms; inherit (networkmanager.meta) platforms;
license = licenses.gpl2Plus;
}; };
} }