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

Merge pull request #92838 from dguibert/dg/network-manager-plugin-without-gnome

Browse Source
This commit is contained in:
Jan Tojnar 2020-08-17 14:20:59 +02:00 committed by GitHub
commit edadf130fc
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/network-manager/iodine/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3 { stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3
, withGnome ? true, gnome3, fetchpatch, libnma }: , withGnome ? true, gnome3, fetchpatch, libnma, glib }:
let let
pname = "NetworkManager-iodine"; pname = "NetworkManager-iodine";
@ -27,7 +27,7 @@ in stdenv.mkDerivation {
}) })
]; ];
buildInputs = [ iodine networkmanager ] buildInputs = [ iodine networkmanager glib ]
++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ];
nativeBuildInputs = [ intltool autoreconfHook pkgconfig ]; nativeBuildInputs = [ intltool autoreconfHook pkgconfig ];

4
pkgs/tools/networking/network-manager/vpnc/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret { 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 let
pname = "NetworkManager-vpnc"; pname = "NetworkManager-vpnc";
version = "1.2.6"; 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 ]; ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ];
nativeBuildInputs = [ intltool pkgconfig file ]; nativeBuildInputs = [ intltool pkgconfig file ];