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

gnome3.geocode-glib: fix build

This commit is contained in:
Jan Tojnar 2018-03-13 03:14:37 +01:00
parent a0d9284ad6
commit 8db273f330
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/desktops/gnome-3/core/geocode-glib/default.nix
View File

@ -1,24 +1,38 @@
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json-glib }:
{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobjectIntrospection, gnome3, libsoup, json-glib }:
stdenv.mkDerivation rec {
name = "geocode-glib-${version}";
version = "3.25.4.1";
outputs = [ "out" "dev" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/geocode-glib/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0y6p5l2jrr78p7l4hijjhclzbap005y6h06g3aiglg9i5hk6j0gi";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "geocode-glib"; attrPath = "gnome3.geocode-glib"; };
};
nativeBuildInputs = with gnome3; [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobjectIntrospection ];
buildInputs = with gnome3; [ glib libsoup json-glib ];
buildInputs = with gnome3;
[ intltool pkgconfig glib libsoup json-glib ];
patches = [
./installed-tests-path.patch
];
postPatch = ''
substituteInPlace geocode-glib/tests/meson.build --subst-var-by "installedTests" "$installedTests"
'';
passthru = {
updateScript = gnome3.updateScript {
packageName = "geocode-glib";
attrPath = "gnome3.geocode-glib";
};
};
meta = with stdenv.lib; {
platforms = platforms.linux;
description = "A convenience library for the geocoding and reverse geocoding using Nominatim service";
license = licenses.lgpl2Plus;
maintainers = gnome3.maintainers;
platforms = platforms.linux;
};
}

8
pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch Normal file
View File

@ -0,0 +1,8 @@
--- a/geocode-glib/tests/meson.build
+++ b/geocode-glib/tests/meson.build
@@ -1,4 +1,4 @@
-install_dir = get_option('libexecdir') + '/installed-tests/geocode-glib'
+install_dir = '@installedTests@/libexec/installed-tests/geocode-glib'
e = executable('geo-uri',
'geo-uri.c',