diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-10-19 14:40:23 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-01-07 10:22:32 +0000 |
| commit | cc62bcb55359ba8c5e0fe3a48e778444c89060d8 (patch) | |
| tree | ca0e21d44eaf8837b687395e614445f7761d7bbd /nixpkgs/pkgs/development/libraries/folks | |
| parent | d6625e8d25efd829c3cfa227d025ca4e606ae4b7 (diff) | |
| parent | a323570a264da96a0b0bcc1c9aa017794acdc752 (diff) | |
| download | nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.gz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.bz2 nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.lz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.xz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.zst nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.zip | |
Merge commit 'a323570a264da96a0b0bcc1c9aa017794acdc752'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/folks')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/folks/default.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/folks/default.nix b/nixpkgs/pkgs/development/libraries/folks/default.nix index 720c274ad520..45d3f128c01c 100644 --- a/nixpkgs/pkgs/development/libraries/folks/default.nix +++ b/nixpkgs/pkgs/development/libraries/folks/default.nix @@ -1,5 +1,7 @@ -{ fetchurl -, lib, stdenv +{ stdenv +, lib +, fetchurl +, fetchpatch , pkg-config , meson , ninja @@ -43,6 +45,15 @@ stdenv.mkDerivation rec { sha256 = "Idc3+vCT9L4GVHPucMogiFuaLDaFlB26JMIjn9PFRKU="; }; + patches = [ + # Fix build with evolution-data-server ≥ 3.41 + # https://gitlab.gnome.org/GNOME/folks/-/merge_requests/52 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/folks/-/commit/62d588b0c609de17df5b4d1ebfbc67c456267efc.patch"; + sha256 = "TDL/5kvVwHnvDMuKDdPLQmpmE1FTZhY+7HG8NxKqt5w="; + }) + ]; + nativeBuildInputs = [ gettext gobject-introspection |