From dbe9bf7e59a47d4a64d790841b4741e5076dafab Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Fri, 21 Jun 2013 19:59:20 +0200
Subject: [PATCH] networkmanagerapplet: 0.9.8.0 -> 0.9.8.2
Upgraded because some icons weren't displaying. Also adds new
dependency libsecret.
---
.../libraries/libsecret/default.nix | 22 +++++++++++++++++++
.../network-manager-applet/default.nix | 10 ++++-----
pkgs/top-level/all-packages.nix | 2 ++
3 files changed, 29 insertions(+), 5 deletions(-)
create mode 100644 pkgs/development/libraries/libsecret/default.nix
diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
new file mode 100644
index 000000000000..70c20caa88af
--- /dev/null
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, glib, dbus_libs, unzip, automake, libtool, autoconf, m4, docbook_xsl,
+ intltool, gtk_doc, gobjectIntrospection, pkgconfig, libxslt, libgcrypt }:
+
+stdenv.mkDerivation rec {
+ version = "0.15";
+ name = "libsecret-${version}";
+
+ src = fetchurl {
+ url = "https://git.gnome.org/browse/libsecret/snapshot/libsecret-${version}.zip";
+ sha256 = "088v1z7zbdi8b0779jads7q20x1gx6c4zmrj3q0vysc7a0k16i6k";
+ };
+
+ propagatedBuildInputs = [ glib dbus_libs ];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ gtk_doc automake libtool autoconf intltool gobjectIntrospection pkgconfig libxslt libgcrypt m4 docbook_xsl ];
+
+ configureScript = "./autogen.sh";
+
+ meta = {
+ inherit (glib.meta) platforms maintainers;
+ };
+}
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 7daf12075675..7e86b5769679 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf
-, libnotify, libgnome_keyring, dbus_glib, polkit, isocodes
+, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring
, mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
, makeWrapper, networkmanager_openvpn, udev }:
let
pn = "network-manager-applet";
major = "0.9";
- version = "${major}.8.0";
+ version = "${major}.8.2";
in
stdenv.mkDerivation rec {
@@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz";
- sha256 = "141m0n4fhsv1k82jm4531f12mq29d3213lph5c9rbfkhd1rnxyqs";
+ sha256 = "1ixd19b7ap29lz9lq4mmlq9lqsmnisix1a33hrxrl68wjx1wfh55";
};
buildInputs = [
- gtk libglade networkmanager GConf libnotify libgnome_keyring dbus_glib
- polkit isocodes makeWrapper udev
+ gtk libglade networkmanager GConf libnotify libsecret dbus_glib
+ polkit isocodes makeWrapper udev libgnome_keyring
];
nativeBuildInputs = [ intltool pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 404a36bb2b9d..1db460827c5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4420,6 +4420,8 @@ let
libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { };
libgnome_keyring3 = gnome3.libgnome_keyring;
+ libsecret = callPackage ../development/libraries/libsecret { };
+
libgtop = callPackage ../development/libraries/libgtop {};
liblo = callPackage ../development/libraries/liblo { };