From e0bdf84eafd6e55cc4e2ed5e5b13df3ce71bc2dd Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 16 Mar 2019 17:33:52 -0400 Subject: [PATCH] pantheon.elementary-photos: fix build --- .../pantheon/apps/elementary-photos/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 21d5b9f1db4..644841354e5 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, desktop-file-utils -, gtk3, glib, libaccounts-glib, libexif, libgee, geocode-glib, gexiv2,libgphoto2 +, gtk3, glib, libaccounts-glib, libexif, libgee, geocode-glib, gexiv2,libgphoto2, fetchpatch , granite, gst_all_1, libgudev, json-glib, libraw, librest, libsoup, sqlite, python3 , scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, gobject-introspection, elementary-icon-theme }: @@ -66,6 +66,14 @@ stdenv.mkDerivation rec { "-Dplugins=false" ]; + patches = [ + # Fix build against gexiv2 0.12 + (fetchpatch { + url = "https://github.com/elementary/photos/commit/86df00ced674abb2ee430ea24422079cfabb314c.patch"; + sha256 = "0836fzja93w36jf7ldqypsmnqn46mwsl93q41m104zn8qm0wrkmy"; + }) + ]; + postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py