diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-09-05 00:50:56 +0000 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-11-30 21:34:28 +0100 |
| commit | 6182a3fe4d77ff3b3dc7734e6f82470e76c426a6 (patch) | |
| tree | c8c64138dcc205af834720f628e95bbfc690cf27 /pkgs/development/libraries/libsecret | |
| parent | 3844468c934322a23fc2406a2ef58171d203765b (diff) | |
libsecret: 0.18.5 → 0.18.6
Diffstat (limited to 'pkgs/development/libraries/libsecret')
| -rw-r--r-- | pkgs/development/libraries/libsecret/default.nix | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 4fc0d6688d4e..afc1b576b07c 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,30 +1,39 @@ -{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl -, libgcrypt, gobjectIntrospection, vala_0_38, gnome3, libintl }: +{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, python3, docbook_xsl, docbook_xml_dtd_42 +, libgcrypt, gobjectIntrospection, vala, gtk-doc, gnome3, libintl, dbus, xvfb_run }: stdenv.mkDerivation rec { pname = "libsecret"; - version = "0.18.5"; + version = "0.18.6"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1cychxc3ff8fp857iikw0n2s13s2mhw2dn1mr632f7w3sn6vvrww"; + sha256 = "0vynag97a9bnnb8ipah45av8xg8jzmhd572rw3zj78s1pa8ciysy"; }; postPatch = '' patchShebangs . ''; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl libintl ]; - buildInputs = [ libgcrypt gobjectIntrospection vala_0_38 ]; + nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl docbook_xml_dtd_42 libintl gobjectIntrospection vala gtk-doc ]; + buildInputs = [ libgcrypt ]; # optional: build docs with gtk-doc? (probably needs a flag as well) - # checkInputs = [ python2 ]; + enableParallelBuilding = true; - doCheck = false; # fails. with python3 tests fail to evaluate, with python2 they fail to run python3 + installCheckInputs = [ python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb_run dbus gnome3.gjs ]; + + # needs to run after install because typelibs point to absolute paths + doInstallCheck = false; # Failed to load shared library '/force/shared/libmock_service.so.0' referenced by the typelib + installCheckPhase = '' + export NO_AT_BRIDGE=1 + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + make check + ''; passthru = { updateScript = gnome3.updateScript { |