JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnome3.gexiv2: re-enable bindings

Browse Source 
After effa9e4045, 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.
This commit is contained in:
Jan Tojnar 2018-02-02 13:21:02 +01:00
parent b31642ac72
commit f8c59e083a
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/desktops/gnome-3/misc/gexiv2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3 }: { stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3, gobjectIntrospection, vala }:
let let
majorVersion = "0.10"; majorVersion = "0.10";
@ -13,18 +13,23 @@ stdenv.mkDerivation rec {
}; };
patches = [ patches = [
# https://bugzilla.gnome.org/show_bug.cgi?id=791941 # Darwin compatibility (https://bugzilla.gnome.org/show_bug.cgi?id=791941)
(fetchurl { (fetchurl {
url = https://bugzilla.gnome.org/attachment.cgi?id=365969; url = https://bugzilla.gnome.org/attachment.cgi?id=365969;
sha256 = "06w744acgnz3hym7sm8c245yzlg05ldkmwgiz3yz4pp6h72brizj"; 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 = '' preConfigure = ''
patchShebangs . patchShebangs .
''; '';
nativeBuildInputs = [ meson ninja pkgconfig ]; nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection vala ];
buildInputs = [ glib ]; buildInputs = [ glib ];
propagatedBuildInputs = [ exiv2 ]; propagatedBuildInputs = [ exiv2 ];