Skip to content

libnm: init, libproxy: use libnm instead of full networkmanager #241762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SuperSandro2000 wants to merge 2 commits into from
Closed

libnm: init, libproxy: use libnm instead of full networkmanager #241762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f6561f
libnm: init
SuperSandro2000 Jul 5, 2023
9c6eb25
libproxy: use libnm instead of full networkmanager
SuperSandro2000 Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libproxy/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
, cmake
, zlib
, dbus
, networkmanager
, libnm
, enableJavaScript ? stdenv.isDarwin || lib.meta.availableOn stdenv.hostPlatform duktape
, duktape
, pcre
Expand Down Expand Up @@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
] else [
glib
dbus
networkmanager
libnm
]);

cmakeFlags = [
Expand Down
26 changes: 18 additions & 8 deletions pkgs/tools/networking/networkmanager/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
, mobile-broadband-provider-info
, runtimeShell
, buildPackages
, libnmOnly ? false
}:

let
Expand Down Expand Up @@ -91,8 +92,8 @@ stdenv.mkDerivation rec {
"-Dpppd=${ppp}/bin/pppd"
"-Diptables=${iptables}/bin/iptables"
"-Dnft=${nftables}/bin/nft"
"-Dmodem_manager=true"
"-Dnmtui=true"
(lib.mesonBool "modem_manager" (!libnmOnly))
(lib.mesonBool "nmtui" (!libnmOnly))
"-Ddnsmasq=${dnsmasq}/bin/dnsmasq"
"-Dqt=false"

Expand Down Expand Up @@ -145,15 +146,18 @@ stdenv.mkDerivation rec {
ppp
libndp
curl
mobile-broadband-provider-info
jansson
dbus # used to get directory paths with pkg-config during configuration
] ++ lib.optionals (!libnmOnly) [
# for nmtui
newt
readline
# for plugins
bluez5
dnsmasq
modemmanager
readline
newt
libsoup
jansson
dbus # used to get directory paths with pkg-config during configuration
mobile-broadband-provider-info
modemmanager
Comment on lines +152 to +160
Copy link
Member Author

@SuperSandro2000 SuperSandro2000 Jul 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved most plugin dependencies out here, so build and runtime closure size should both be significant smaller now.

];

propagatedBuildInputs = [ gnutls libgcrypt ];
Expand Down Expand Up @@ -199,6 +203,12 @@ stdenv.mkDerivation rec {
ln -s $PWD/src/libnm-client-impl/libnm.so.0 ${placeholder "out"}/lib/libnm.so.0
'';

# upstream does not offer a way to only compile libnm and we cannot just move libnm to a different output
# without regenerating the git files
postInstall = lib.optionalString libnmOnly ''
rm -rf $out/{,s}bin/
'';

postFixup = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
cp -r ${buildPackages.networkmanager.devdoc} $devdoc
cp -r ${buildPackages.networkmanager.man} $man
Expand Down
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10687,6 +10687,8 @@ with pkgs;

networkmanager = callPackage ../tools/networking/networkmanager { };

libnm = networkmanager.override { libnmOnly = true; };

networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { };

networkmanager-openvpn = callPackage ../tools/networking/networkmanager/openvpn { };
Expand Down