diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-13 03:14:37 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 07:46:42 +0100 |
commit | 8db273f33085329a32f76118db2945e0a9d887ff (patch) | |
tree | d74f95e353d3fa492215fc89cdbdf270330a1c43 | |
parent | a0d9284ad609431b7be9d486d25a8f190bd0e6ca (diff) | |
download | nixlib-8db273f33085329a32f76118db2945e0a9d887ff.tar nixlib-8db273f33085329a32f76118db2945e0a9d887ff.tar.gz nixlib-8db273f33085329a32f76118db2945e0a9d887ff.tar.bz2 nixlib-8db273f33085329a32f76118db2945e0a9d887ff.tar.lz nixlib-8db273f33085329a32f76118db2945e0a9d887ff.tar.xz nixlib-8db273f33085329a32f76118db2945e0a9d887ff.tar.zst nixlib-8db273f33085329a32f76118db2945e0a9d887ff.zip |
gnome3.geocode-glib: fix build
-rw-r--r-- | pkgs/desktops/gnome-3/core/geocode-glib/default.nix | 28 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch | 8 |
2 files changed, 29 insertions, 7 deletions
diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix index 40071970eec9..910ef01fcb9d 100644 --- a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix +++ b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix @@ -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"; }; + nativeBuildInputs = with gnome3; [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobjectIntrospection ]; + buildInputs = with gnome3; [ 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"; }; + updateScript = gnome3.updateScript { + packageName = "geocode-glib"; + attrPath = "gnome3.geocode-glib"; + }; }; - buildInputs = with gnome3; - [ intltool pkgconfig glib libsoup json-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; }; - } diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch b/pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch new file mode 100644 index 000000000000..499c68008088 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch @@ -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', |