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

Merge pull request #155066 from panicgh/nm-without-gnome

Browse Source 
networkmanager-openvpn/-l2tp: add dependency if built without Gnome
This commit is contained in:
Nikolay Amiantov 2022-02-05 23:34:13 +03:00 committed by GitHub
commit 3e3f30afd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/networking/networkmanager/l2tp/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkg-config
, file, findutils
, gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret
, withGnome ? true, libnma }:
, withGnome ? true, libnma, glib }:
stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
})
];
buildInputs = [ networkmanager ppp ]
buildInputs = [ networkmanager ppp glib ]
++ lib.optionals withGnome [ gtk3 libsecret libnma ];
nativeBuildInputs = [ autoreconfHook libtool intltool pkg-config file findutils ];

4
pkgs/tools/networking/networkmanager/openvpn/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkg-config, file, networkmanager, libsecret
, gtk3, withGnome ? true, gnome, kmod, libnma }:
, glib, gtk3, withGnome ? true, gnome, kmod, libnma }:
let
pname = "NetworkManager-openvpn";
@ -19,7 +19,7 @@ in stdenv.mkDerivation {
})
];
buildInputs = [ openvpn networkmanager ]
buildInputs = [ openvpn networkmanager glib ]
++ lib.optionals withGnome [ gtk3 libsecret libnma ];
nativeBuildInputs = [ intltool pkg-config file libxml2 ];