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

networkmanagerapplet: clean up

Browse Source
This commit is contained in:
Jan Tojnar 2018-03-20 20:10:07 +01:00
parent 9fa2844784
commit 8dc518c2df
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkgs/tools/networking/network-manager-applet/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 { stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3
, libnotify, libsecret, polkit, isocodes, modemmanager , libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl
, mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas
, udev, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk , libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk, gobjectIntrospection
, libindicator-gtk3, libappindicator-gtk3, withGnome ? false }: , libindicator-gtk3, libappindicator-gtk3, withGnome ? false }:
let let
@ -15,31 +15,32 @@ in stdenv.mkDerivation rec {
sha256 = "1hy9ni2rwpy68h7jhn5lm2s1zm1vjchfy8lwj8fpm7xlx3x4pp0a"; sha256 = "1hy9ni2rwpy68h7jhn5lm2s1zm1vjchfy8lwj8fpm7xlx3x4pp0a";
}; };
configureFlags = [ mesonFlags = [
"--sysconfdir=/etc" "-Dselinux=false"
"--without-selinux" "-Dappindicator=true"
"--with-appindicator" "-Dgcr=${if withGnome then "true" else "false"}"
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" "devdoc" ];
buildInputs = [ buildInputs = [
gnome3.gtk libglade networkmanager libnotify libsecret gsettings-desktop-schemas gnome3.gtk networkmanager libnotify libsecret gsettings-desktop-schemas
polkit isocodes udev libgudev gnome3.libgnome-keyring polkit isocodes libgudev
modemmanager jansson glib-networking modemmanager jansson glib-networking
libindicator-gtk3 libappindicator-gtk3 libindicator-gtk3 libappindicator-gtk3
] ++ stdenv.lib.optional withGnome webkitgtk; ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr webkitgtk ];
nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl libxml2 ];
propagatedUserEnvPkgs = [ gnome3.gnome-keyring hicolor-icon-theme ]; propagatedUserEnvPkgs = [ hicolor-icon-theme ];
makeFlags = [ NIX_CFLAGS = [
''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' ''-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''
]; ];
preInstall = '' postPatch = ''
installFlagsArray=( "sysconfdir=$out/etc" ) chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py
''; '';
passthru = { passthru = {
@ -50,7 +51,7 @@ in stdenv.mkDerivation rec {
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://projects.gnome.org/NetworkManager/; homepage = https://wiki.gnome.org/Projects/NetworkManager;
description = "NetworkManager control applet for GNOME"; description = "NetworkManager control applet for GNOME";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ phreedom rickynils ]; maintainers = with maintainers; [ phreedom rickynils ];