diff --git a/pkgs/desktops/gnome/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome/core/libgnome-keyring/default.nix index aa3c7ed3981..9d2e3d4eff7 100644 --- a/pkgs/desktops/gnome/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/libgnome-keyring/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome }: +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome +, testers +}: let pname = "libgnome-keyring"; version = "3.12.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; }; @@ -17,10 +19,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ]; nativeBuildInputs = [ pkg-config intltool ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { description = "Framework for managing passwords and other secrets"; homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; + pkgConfigModules = [ "gnome-keyring-1" ]; inherit (glib.meta) platforms maintainers; longDescription = '' @@ -29,4 +34,4 @@ stdenv.mkDerivation rec { with the gnome-keyring system. ''; }; -} +}) diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index 3f5a5961ba0..775bcf2f2a4 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -1,10 +1,14 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool }: +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgnome-keyring"; version = "2.32.0"; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n"; }; @@ -14,9 +18,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib dbus libgcrypt ]; nativeBuildInputs = [ pkg-config intltool ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "gnome-keyring-1" ]; inherit (glib.meta) platforms maintainers; homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; license = with lib.licenses; [ gpl2 lgpl2 ]; }; -} +})