diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
| commit | 457f28f6f85eea1b1671d62d2abe39297c9c90f7 (patch) | |
| tree | 3c6e68534e7bfcde19893c830af7498b0606e6d2 /pkgs/development/libraries/folks/default.nix | |
| parent | a25e03e76ae1e0367419db1de009e1139d08de68 (diff) | |
| parent | 1aa7d4e6c61526606d9e26f939cdb60ec8f45fcd (diff) | |
Merge branch 'master' into staging-next
; Conflicts: ; pkgs/development/tools/codespell/default.nix codespell 2.2.2 switched to pyproject & setuptools_scm: https://github.com/codespell-project/codespell/pull/2523
Diffstat (limited to 'pkgs/development/libraries/folks/default.nix')
| -rw-r--r-- | pkgs/development/libraries/folks/default.nix | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 41ede8b85a848..0471283ef00cf 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -1,28 +1,22 @@ { stdenv , lib , fetchurl +, fetchpatch , pkg-config , meson , ninja , glib , gnome -, nspr , gettext , gobject-introspection , vala , sqlite -, libxml2 , dbus-glib -, libsoup -, nss , dbus , libgee , evolution-data-server-gtk4 -, libsecret -, db , python3 , readline -, gtk3 , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 @@ -43,31 +37,35 @@ stdenv.mkDerivation rec { sha256 = "D/+KiWMwzYKu5FmDJPflQciE0DN1NiEnI7S+s4x1kIY="; }; + patches = [ + # Do not check for unneeded GTK dependency. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/folks/-/commit/686d58fb2454e5038bb951423245ed8c2d4b5cf6.patch"; + sha256 = "0ydafVKhSrkHZK8bitPF5mNDTG5GrixGzBgBLNzLuXQ="; + }) + ]; + nativeBuildInputs = [ gettext gobject-introspection - gtk3 gtk-doc docbook-xsl-nons docbook_xml_dtd_43 meson ninja pkg-config - python3 vala + ] ++ lib.optionals telepathySupport [ + python3 ]; buildInputs = [ - db dbus-glib - evolution-data-server-gtk4 - libsecret - libsoup - libxml2 - nspr - nss + evolution-data-server-gtk4 # UI part not needed, using gtk4 version to reduce system closure. readline - ] ++ lib.optional telepathySupport telepathy-glib; + ] ++ lib.optionals telepathySupport [ + telepathy-glib + ]; propagatedBuildInputs = [ glib @@ -105,9 +103,7 @@ stdenv.mkDerivation rec { runHook postCheck ''; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py + postPatch = lib.optionalString telepathySupport '' patchShebangs tests/tools/manager-file.py ''; |