a19cd4ffb1
This reverts commit 65a333600d5c88a98d674f637d092807cfc12253. This wasn't tested for correctness with something like fodwatch [0], and should not have been (self-)merged so quickly, especially without further review. It also resulted in the breakage of at least one package [1] (and that's the one we know of and was caught). A few packages that were updated in between this commit and this revert were not reverted back to using `rev`, but other than that, this is a 1:1 revert. [0]: https://codeberg.org/raphaelr/fodwatch [1]: https://github.com/NixOS/nixpkgs/pull/396904 / 758551e4587d75882aebc21a04bee960418f8ce9
91 lines
1.6 KiB
Nix
91 lines
1.6 KiB
Nix
{
|
|
stdenv,
|
|
lib,
|
|
replaceVars,
|
|
fetchFromGitHub,
|
|
autoreconfHook,
|
|
pkg-config,
|
|
gtk3,
|
|
gtk4,
|
|
networkmanager,
|
|
ppp,
|
|
xl2tpd,
|
|
strongswan,
|
|
libsecret,
|
|
withGnome ? true,
|
|
libnma,
|
|
libnma-gtk4,
|
|
glib,
|
|
openssl,
|
|
nss,
|
|
}:
|
|
|
|
stdenv.mkDerivation rec {
|
|
name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}";
|
|
pname = "NetworkManager-l2tp";
|
|
version = "1.20.20";
|
|
|
|
src = fetchFromGitHub {
|
|
owner = "nm-l2tp";
|
|
repo = "network-manager-l2tp";
|
|
rev = version;
|
|
hash = "sha256-AmbDWBCUG9fvqA6iJopYtbitdRwv2faWvIeKN90p234=";
|
|
};
|
|
|
|
patches = [
|
|
(replaceVars ./fix-paths.patch {
|
|
inherit strongswan xl2tpd;
|
|
})
|
|
];
|
|
|
|
nativeBuildInputs =
|
|
[
|
|
autoreconfHook
|
|
glib # for gdbus-codegen
|
|
pkg-config
|
|
]
|
|
++ lib.optionals withGnome [
|
|
gtk4 # for gtk4-builder-tool
|
|
];
|
|
|
|
buildInputs =
|
|
[
|
|
networkmanager
|
|
ppp
|
|
openssl
|
|
nss
|
|
]
|
|
++ lib.optionals withGnome [
|
|
gtk3
|
|
gtk4
|
|
libsecret
|
|
libnma
|
|
libnma-gtk4
|
|
];
|
|
|
|
configureFlags = [
|
|
"--with-gnome=${if withGnome then "yes" else "no"}"
|
|
"--with-gtk4=${if withGnome then "yes" else "no"}"
|
|
"--localstatedir=/var"
|
|
"--enable-absolute-paths"
|
|
];
|
|
|
|
enableParallelBuilding = true;
|
|
strictDeps = true;
|
|
|
|
passthru = {
|
|
networkManagerPlugin = "VPN/nm-l2tp-service.name";
|
|
};
|
|
|
|
meta = with lib; {
|
|
description = "L2TP plugin for NetworkManager";
|
|
inherit (networkmanager.meta) platforms;
|
|
homepage = "https://github.com/nm-l2tp/network-manager-l2tp";
|
|
license = licenses.gpl2Plus;
|
|
maintainers = with maintainers; [
|
|
abbradar
|
|
obadz
|
|
];
|
|
};
|
|
}
|