mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00
Code Issues Wiki Activity

Merge pull request #1917 from romildo/master

Browse source 
Liferea and gnome3.libgnome_keyring fixes
This commit is contained in:
Domen Kožar 2014-03-11 08:30:50 +01:00
parent 691b499a66 0704190b33
commit cb675d51ef
2 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/applications/networking/newsreaders/liferea/default.nix
View file

@ -1,7 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool, python, pygobject3 { stdenv, fetchurl, pkgconfig, intltool, python, pygobject3
, glib, gnome3, pango, libxml2, libxslt, sqlite, libsoup , glib, gnome3, pango, libxml2, libxslt, sqlite, libsoup
, webkitgtk, json_glib, gobjectIntrospection, gsettings_desktop_schemas , webkitgtk, json_glib, gobjectIntrospection, gst_all_1
, gst_all_1
, libnotify , libnotify
, makeWrapper , makeWrapper
}: }:
@ -20,10 +19,10 @@ stdenv.mkDerivation rec {
buildInputs = with gst_all_1; [ buildInputs = with gst_all_1; [
pkgconfig intltool python pkgconfig intltool python
glib gnome3.gtk pango libxml2 libxslt sqlite libsoup glib gnome3.gtk pango libxml2 libxslt sqlite libsoup
webkitgtk json_glib gobjectIntrospection gsettings_desktop_schemas webkitgtk json_glib gobjectIntrospection gnome3.gsettings_desktop_schemas
gnome3.libpeas gnome3.libpeas gnome3.dconf
gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-bad
gnome3.gnome_keyring gnome3.libgnome_keyring
libnotify libnotify
makeWrapper makeWrapper
]; ];
@ -35,9 +34,10 @@ stdenv.mkDerivation rec {
for f in "$out"/bin/*; do for f in "$out"/bin/*; do
wrapProgram "$f" \ wrapProgram "$f" \
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
--prefix LD_LIBRARY_PATH : "${gnome3.libgnome_keyring}/lib" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_icon_theme}/share:${gsettings_desktop_schemas}/share:${gnome3.gtk}/share:$out/share" --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share"
done done
''; '';
@ -47,5 +47,12 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ vcunat romildo ]; maintainers = with stdenv.lib.maintainers; [ vcunat romildo ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
longDescription = ''
Liferea (Linux Feed Reader) is an RSS/RDF feed reader.
It's intended to be a clone of the Windows-only FeedReader.
It can be used to maintain a list of subscribed feeds,
browse through their items, and show their contents.
'';
}; };
} }

19
pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
View file

@ -1,17 +1,26 @@
{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool }: { stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libgnome-keyring-3.6.0"; name = "libgnome-keyring-3.10.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/libgnome-keyring/3.6/${name}.tar.xz"; url = "mirror://gnome/sources/libgnome-keyring/3.10/${name}.tar.xz";
sha256 = "0c4qrjpmv1hqga3xv6wsq2z10x2n78qgw7q3k3s01y1pggxkgjkd"; sha256 = "0wip88r91kwx4zp6sc9b38mnlv11grgl4k2kzsd3a8x83c9g2b05";
}; };
propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ];
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];
meta = { meta = {
description = "Framework for managing passwords and other secrets";
homepage = http://live.gnome.org/GnomeKeyring;
license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
inherit (glib.meta) platforms maintainers; inherit (glib.meta) platforms maintainers;
longDescription = ''
gnome-keyring is a program that keeps password and other secrets for
users. The library libgnome-keyring is used by applications to integrate
with the gnome-keyring system.
'';
}; };
} }