diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-02-02 13:21:02 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-02-02 15:33:41 +0100 |
commit | f8c59e083ab2f70457c0b4f2086100d916a60c77 (patch) | |
tree | c7487239d067ad5207e52e0b4ff9570b76a334c1 /pkgs/desktops | |
parent | b31642ac72440a53ce510fa08c4cbe8061877a65 (diff) | |
download | nixlib-f8c59e083ab2f70457c0b4f2086100d916a60c77.tar nixlib-f8c59e083ab2f70457c0b4f2086100d916a60c77.tar.gz nixlib-f8c59e083ab2f70457c0b4f2086100d916a60c77.tar.bz2 nixlib-f8c59e083ab2f70457c0b4f2086100d916a60c77.tar.lz nixlib-f8c59e083ab2f70457c0b4f2086100d916a60c77.tar.xz nixlib-f8c59e083ab2f70457c0b4f2086100d916a60c77.tar.zst nixlib-f8c59e083ab2f70457c0b4f2086100d916a60c77.zip |
gnome3.gexiv2: re-enable bindings
After effa9e40457e801577b672dadbcc169fd1ad20a3, which switched to Meson, the Vala bindings were not built which broke Shotwell. Enabling Vala was not enough due to a bug, though, so we have to patch it.
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome-3/misc/gexiv2/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix index 41040db72ce4..852ed00ed902 100644 --- a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix +++ b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3 }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3, gobjectIntrospection, vala }: let majorVersion = "0.10"; @@ -13,18 +13,23 @@ stdenv.mkDerivation rec { }; patches = [ - # https://bugzilla.gnome.org/show_bug.cgi?id=791941 + # Darwin compatibility (https://bugzilla.gnome.org/show_bug.cgi?id=791941) (fetchurl { url = https://bugzilla.gnome.org/attachment.cgi?id=365969; sha256 = "06w744acgnz3hym7sm8c245yzlg05ldkmwgiz3yz4pp6h72brizj"; }) + # GIR & Vala bindings fix (https://bugzilla.gnome.org/show_bug.cgi?id=792431) + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=366662; + sha256 = "1ljb2pap5v9z3zhx69ghfyrbl2b62ck35nyn7h5h410d008lcb4v"; + }) ]; preConfigure = '' patchShebangs . ''; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection vala ]; buildInputs = [ glib ]; propagatedBuildInputs = [ exiv2 ]; |