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

Merge pull request #32409 from romildo/fix.network-manager-applet

Browse Source 
libdbusmenu: 12.10.12 -> 16.04.0; network-manager-applet: enable appindicator support
This commit is contained in:
Orivej Desh 2017-12-17 04:34:39 +00:00 committed by GitHub
commit a9f83b1203
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/libdbusmenu/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, lib, file { stdenv, fetchurl, lib, file
, pkgconfig, intltool , pkgconfig, intltool
, glib, dbus_glib, json_glib , glib, dbus_glib, json_glib
, gobjectIntrospection, vala_0_23, gnome_doc_utils , gobjectIntrospection, vala_0_38, gnome_doc_utils
, gtkVersion ? null, gtk2 ? null, gtk3 ? null }: , gtkVersion ? null, gtk2 ? null, gtk3 ? null }:
with lib; with lib;
@ -10,19 +10,19 @@ stdenv.mkDerivation rec {
name = let postfix = if gtkVersion == null then "glib" else "gtk${gtkVersion}"; name = let postfix = if gtkVersion == null then "glib" else "gtk${gtkVersion}";
in "libdbusmenu-${postfix}-${version}"; in "libdbusmenu-${postfix}-${version}";
version = "${versionMajor}.${versionMinor}"; version = "${versionMajor}.${versionMinor}";
versionMajor = "12.10"; versionMajor = "16.04";
versionMinor = "2"; versionMinor = "0";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/${versionMajor}/${version}/+download/libdbusmenu-${version}.tar.gz"; url = "${meta.homepage}/${versionMajor}/${version}/+download/libdbusmenu-${version}.tar.gz";
sha256 = "9d6ad4a0b918b342ad2ee9230cce8a095eb601cb0cee6ddc1122d0481f9d04c9"; sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r";
}; };
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ buildInputs = [
glib dbus_glib json_glib glib dbus_glib json_glib
gobjectIntrospection vala_0_23 gnome_doc_utils gobjectIntrospection vala_0_38 gnome_doc_utils
] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3);
postPatch = '' postPatch = ''
@ -49,10 +49,11 @@ stdenv.mkDerivation rec {
installFlags = [ installFlags = [
"sysconfdir=\${out}/etc" "sysconfdir=\${out}/etc"
"localstatedir=\${TMPDIR}" "localstatedir=\${TMPDIR}"
"typelibdir=\${out}/lib/girepository-1.0"
]; ];
meta = { meta = {
description = "A library for passing menu structures across DBus"; description = "Library for passing menu structures across DBus";
homepage = https://launchpad.net/dbusmenu; homepage = https://launchpad.net/dbusmenu;
license = with licenses; [ gpl3 lgpl21 lgpl3 ]; license = with licenses; [ gpl3 lgpl21 lgpl3 ];
platforms = platforms.linux; platforms = platforms.linux;

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

@ -2,7 +2,7 @@
, libnotify, libsecret, polkit, isocodes, modemmanager , libnotify, libsecret, polkit, isocodes, modemmanager
, 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 , udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk
, withGnome ? false }: , libindicator-gtk3, libappindicator-gtk3, withGnome ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${major}.${minor}"; name = "${pname}-${major}.${minor}";
@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--without-selinux" "--without-selinux"
"--with-appindicator"
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -26,6 +27,7 @@ stdenv.mkDerivation rec {
gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas
polkit isocodes udev libgudev gnome3.libgnome_keyring polkit isocodes udev libgudev gnome3.libgnome_keyring
modemmanager jansson glib_networking modemmanager jansson glib_networking
libindicator-gtk3 libappindicator-gtk3
] ++ stdenv.lib.optional withGnome webkitgtk; ] ++ stdenv.lib.optional withGnome webkitgtk;
nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];