diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-14 09:25:16 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-14 09:25:25 +0200 |
| commit | 92a26320e7b9bbfe781e222a17c518443f63316a (patch) | |
| tree | db6e4fe7706ec8c065d7efe10e93b38ea1b149ba /pkgs/applications/misc/almanah/default.nix | |
| parent | 2006fd4fc5a20c72ab2166b2b4039307f4f54bcb (diff) | |
| parent | 85a05878846b75254f97b8690c18a470cfe982f0 (diff) | |
| download | nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.gz nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.bz2 nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.lz nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.xz nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.zst nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/misc/almanah/default.nix')
| -rw-r--r-- | pkgs/applications/misc/almanah/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index f554d36a0c6a..b7b7cfea7c1a 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch , atk , cairo , desktop-file-utils @@ -30,6 +31,15 @@ stdenv.mkDerivation rec { sha256 = "09rxx4s4c34d1axza6ayss33v78p44r9bpx058shllh1sf5avpcb"; }; + patches = [ + # Fix gpgme detection + # https://gitlab.gnome.org/GNOME/almanah/merge_requests/7 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/almanah/commit/4b979c4145ef2fbceebb3849a70df1d0ceb1bb93.patch"; + sha256 = "q3M+osNWz7AsDQtFju5S7P4wH3cAdzKOPKnEXTJ+k3M="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils gettext |