mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
Merge pull request #92838 from dguibert/dg/network-manager-plugin-without-gnome
This commit is contained in:
commit
edadf130fc
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3
|
||||
, withGnome ? true, gnome3, fetchpatch, libnma }:
|
||||
, withGnome ? true, gnome3, fetchpatch, libnma, glib }:
|
||||
|
||||
let
|
||||
pname = "NetworkManager-iodine";
|
||||
@ -27,7 +27,7 @@ in stdenv.mkDerivation {
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ iodine networkmanager ]
|
||||
buildInputs = [ iodine networkmanager glib ]
|
||||
++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ];
|
||||
|
||||
nativeBuildInputs = [ intltool autoreconfHook pkgconfig ];
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret
|
||||
, gtk3, withGnome ? true, gnome3, kmod, file, fetchpatch, libnma }:
|
||||
, gtk3, withGnome ? true, gnome3, glib, kmod, file, fetchpatch, libnma }:
|
||||
let
|
||||
pname = "NetworkManager-vpnc";
|
||||
version = "1.2.6";
|
||||
@ -23,7 +23,7 @@ in stdenv.mkDerivation {
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ vpnc networkmanager ]
|
||||
buildInputs = [ vpnc networkmanager glib ]
|
||||
++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ];
|
||||
|
||||
nativeBuildInputs = [ intltool pkgconfig file ];
|
||||
|
Loading…
Reference in New Issue
Block a user