cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

networkmanager_strongswan: Format the expression

Browse source 
And use placeholders instead of Makefile variable interpolation.
Also move environment variable near each other.
This commit is contained in:
Jan Tojnar 2022-04-26 14:16:37 +02:00
parent a0e8b9daf6
commit 85bed48e82
1 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
pkgs/tools/networking/networkmanager/strongswan/default.nix
View file

@ -1,5 +1,15 @@
{ lib, stdenv, fetchurl, intltool, pkg-config, networkmanager, strongswanNM { stdenv
, gtk3, gnome, libsecret, libnma }: , lib
, fetchurl
, intltool
, pkg-config
, networkmanager
, strongswanNM
, gtk3
, gnome
, libsecret
, libnma
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "NetworkManager-strongswan"; pname = "NetworkManager-strongswan";
@ -10,26 +20,35 @@ stdenv.mkDerivation rec {
sha256 = "0sc1yzlxjfvl58hjjw99bchqc4061i3apw254z61v22k4sajnif8"; sha256 = "0sc1yzlxjfvl58hjjw99bchqc4061i3apw254z61v22k4sajnif8";
}; };
buildInputs = [ networkmanager strongswanNM libsecret gtk3 libnma ]; nativeBuildInputs = [
intltool
pkg-config
];
nativeBuildInputs = [ intltool pkg-config ]; buildInputs = [
networkmanager
# glib-2.62 deprecations strongswanNM
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; libsecret
gtk3
libnma
];
configureFlags = [ configureFlags = [
"--without-libnm-glib" "--without-libnm-glib"
"--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm"
"--with-nm-libexecdir=$(out)/libexec" "--with-nm-libexecdir=${placeholder "out"}/libexec"
"--with-nm-plugindir=$(out)/lib/NetworkManager" "--with-nm-plugindir=${placeholder "out"}/lib/NetworkManager"
]; ];
PKG_CONFIG_LIBNM_VPNSERVICEDIR = "${placeholder "out"}/lib/NetworkManager/VPN";
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
passthru = { passthru = {
networkManagerPlugin = "VPN/nm-strongswan-service.name"; networkManagerPlugin = "VPN/nm-strongswan-service.name";
}; };
PKG_CONFIG_LIBNM_VPNSERVICEDIR = "$(out)/lib/NetworkManager/VPN";
meta = with lib; { meta = with lib; {
description = "NetworkManager's strongswan plugin"; description = "NetworkManager's strongswan plugin";
inherit (networkmanager.meta) platforms; inherit (networkmanager.meta) platforms;