Skip to content

Commit

Permalink
gnome3.gexiv2: re-enable bindings
Browse files Browse the repository at this point in the history
After effa9e4, 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.
  • Loading branch information
jtojnar committed Feb 2, 2018
1 parent b31642a commit f8c59e0
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions 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";
Expand All @@ -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 ];

Expand Down

0 comments on commit f8c59e0

Please sign in to comment.