diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2017-12-18 19:42:32 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2017-12-20 05:16:50 +0100 |
commit | e6936dd556f2df2162b51dea30fc99532ce6f37f (patch) | |
tree | 41b42c57cfdb09474f6f9d26d0e5824face1a374 | |
parent | a0a692b3a30285b9615eb1da9745ca5119924044 (diff) | |
download | nixlib-e6936dd556f2df2162b51dea30fc99532ce6f37f.tar nixlib-e6936dd556f2df2162b51dea30fc99532ce6f37f.tar.gz nixlib-e6936dd556f2df2162b51dea30fc99532ce6f37f.tar.bz2 nixlib-e6936dd556f2df2162b51dea30fc99532ce6f37f.tar.lz nixlib-e6936dd556f2df2162b51dea30fc99532ce6f37f.tar.xz nixlib-e6936dd556f2df2162b51dea30fc99532ce6f37f.tar.zst nixlib-e6936dd556f2df2162b51dea30fc99532ce6f37f.zip |
gnome3.gnome_keyring: clarify Python version & enable tests
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 4baafecadd0a..6a6722c3b60f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt +{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python2, glib, libxslt , intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, wrapGAppsHook -, docbook_xsl_ns, docbook_xsl, gnome3 }: +, docbook_xsl, docbook_xml_dtd_42, gnome3 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -8,21 +8,41 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = with gnome3; [ - dbus libgcrypt pam python gtk3 gconf libgnome_keyring + dbus libgcrypt pam gtk3 gconf libgnome_keyring pango gcr gdk_pixbuf atk p11_kit ]; + # In 3.20.1, tests do not support Python 3 + checkInputs = [ dbus python2 ]; + propagatedBuildInputs = [ glib libtasn1 libxslt ]; - nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl wrapGAppsHook ]; + nativeBuildInputs = [ + pkgconfig intltool docbook_xsl docbook_xml_dtd_42 wrapGAppsHook + ] ++ stdenv.lib.optionals doCheck checkInputs; configureFlags = [ "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories "--with-pkcs11-modules=$$out/lib/pkcs11/" ]; + postPatch = '' + patchShebangs build + ''; + + doCheck = true; + checkPhase = '' + export HOME=$(mktemp -d) + dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + make check + ''; + meta = with stdenv.lib; { - platforms = platforms.linux; + description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications"; + homepage = https://wiki.gnome.org/Projects/GnomeKeyring; + license = licenses.gpl2; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; } |