gnome3: port and update (lib)gnome-keyring

This commit is contained in:
Vladimír Čunát 2013-02-21 20:36:20 +01:00
parent 38a0bc8cdf
commit b8a44440e4
5 changed files with 47 additions and 19 deletions

View File

@ -0,0 +1,26 @@
{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib
, gtk3, intltool, gconf, libgnome_keyring, pango, gcr, gdk_pixbuf, atk, p11_kit }:
stdenv.mkDerivation rec {
name = "gnome-keyring-3.6.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-keyring/3.6/${name}.tar.xz";
sha256 = "1mhc2c0qswfjqi2spdvh19b7npfkjf1k40q6v7fja4qpc26maq5f";
};
buildInputs = [
dbus libgcrypt pam python gtk3 gconf libgnome_keyring
pango gcr gdk_pixbuf atk p11_kit
];
propagatedBuildInputs = [ glib libtasn1 ];
nativeBuildInputs = [ pkgconfig intltool ];
configureFlags = [
"--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path
"--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
"--with-pkcs11-modules=$$out/lib/pkcs11/"
];
}

View File

@ -0,0 +1,17 @@
{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool }:
stdenv.mkDerivation rec {
name = "libgnome-keyring-3.6.0";
src = fetchurl {
url = "mirror://gnome/sources/libgnome-keyring/3.6/${name}.tar.xz";
sha256 = "0c4qrjpmv1hqga3xv6wsq2z10x2n78qgw7q3k3s01y1pggxkgjkd";
};
propagatedBuildInputs = [ glib dbus_libs libgcrypt ];
nativeBuildInputs = [ pkgconfig intltool ];
meta = {
inherit (glib.meta) platforms maintainers;
};
}

View File

@ -19,6 +19,9 @@ rec {
gcr = callPackage ./core/gcr { }; # ToDo: tests fail
gnome_keyring = callPackage ./core/gnome-keyring { };
libgnome_keyring = callPackage ./core/libgnome-keyring { };
gnome_terminal = callPackage ./core/gnome-terminal { };
gsettings_desktop_schemas = lib.lowPrio (callPackage ./core/gsettings-desktop-schemas { });

View File

@ -1,18 +0,0 @@
{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig,
intltool }:
stdenv.mkDerivation {
name = "libgnome-keyring-3.2.2";
src = fetchurl {
url = mirror://gnome/sources/libgnome-keyring/3.2/libgnome-keyring-3.2.2.tar.xz;
sha256 = "1cxd2vb1lzm8smq1q45dsn13s6kdqdb60lashdk7hwv035xy9jrb";
};
propagatedBuildInputs = [ glib dbus_libs libgcrypt ];
nativeBuildInputs = [ pkgconfig intltool ];
meta = {
inherit (glib.meta) platforms maintainers;
};
}

View File

@ -4146,7 +4146,7 @@ let
libgig = callPackage ../development/libraries/libgig { };
libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { };
libgnome_keyring3 = callPackage ../development/libraries/libgnome-keyring/3.x.nix { };
libgnome_keyring3 = gnome3.libgnome_keyring;
libgtop = callPackage ../development/libraries/libgtop {};