diff --git a/pkgs/tools/networking/network-manager/applet/default.nix b/pkgs/tools/networking/network-manager/applet/default.nix index 69b454ea72ee..9de462bbe557 100644 --- a/pkgs/tools/networking/network-manager/applet/default.nix +++ b/pkgs/tools/networking/network-manager/applet/default.nix @@ -1,8 +1,34 @@ -{ stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 -, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43 -, mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas -, libgudev, jansson, wrapGAppsHook, gobject-introspection, python3, gtk3 -, libappindicator-gtk3, withGnome ? true, gcr, glib }: +{ stdenv +, fetchurl +, meson +, ninja +, intltool +, gtk-doc +, pkg-config +, networkmanager +, gnome3 +, libnotify +, libsecret +, polkit +, isocodes +, modemmanager +, libxml2 +, docbook_xsl +, docbook_xml_dtd_43 +, mobile-broadband-provider-info +, glib-networking +, gsettings-desktop-schemas +, libgudev +, jansson +, wrapGAppsHook +, gobject-introspection +, python3 +, gtk3 +, libappindicator-gtk3 +, withGnome ? true +, gcr +, glib +}: let pname = "network-manager-applet"; @@ -25,13 +51,35 @@ in stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "devdoc" "man" ]; buildInputs = [ - gtk3 networkmanager libnotify libsecret gsettings-desktop-schemas - polkit isocodes mobile-broadband-provider-info libgudev - modemmanager jansson glib-networking - libappindicator-gtk3 gnome3.adwaita-icon-theme + gtk3 + networkmanager + libnotify + libsecret + gsettings-desktop-schemas + polkit + isocodes + mobile-broadband-provider-info + libgudev + modemmanager + jansson + glib-networking + libappindicator-gtk3 + gnome3.adwaita-icon-theme ] ++ stdenv.lib.optionals withGnome [ gcr ]; # advanced certificate chooser - nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobject-introspection python3 gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ]; + nativeBuildInputs = [ + meson + ninja + intltool + pkg-config + wrapGAppsHook + gobject-introspection + python3 + gtk-doc + docbook_xsl + docbook_xml_dtd_43 + libxml2 + ]; # Needed for wingpanel-indicator-network and switchboard-plug-network patches = [ ./hardcode-gsettings.patch ]; @@ -40,7 +88,7 @@ in stdenv.mkDerivation rec { chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py - substituteInPlace src/wireless-security/eap-method.c --subst-var-by NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$lib" name} + substituteInPlace src/wireless-security/eap-method.c --subst-var-by NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$lib" "${pname}-${version}"} ''; passthru = {