nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

geocode-glib: rename from gnome3.geocode-glib

Browse Source
This commit is contained in:
Jan Tojnar 2018-12-25 17:28:34 +01:00
parent 7ca5ec11b0
commit 93a6f4414c
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-3/default.nix
View File

@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee;
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib;
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@ -73,8 +73,6 @@ lib.makeScope pkgs.newScope (self: with self; {
evolution-data-server = callPackage ./core/evolution-data-server { };
geocode-glib = callPackage ./core/geocode-glib { };
gcr = callPackage ./core/gcr { }; # ToDo: tests fail
gdm = callPackage ./core/gdm { };

9
pkgs/desktops/gnome-3/core/geocode-glib/default.nix → pkgs/development/libraries/geocode-glib/default.nix
View File

@ -1,13 +1,13 @@
{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib }:
stdenv.mkDerivation rec {
name = "geocode-glib-${version}";
pname = "geocode-glib";
version = "3.26.0";
outputs = [ "out" "dev" "installedTests" ];
outputs = [ "out" "dev" "devdoc" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/geocode-glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
url = "mirror://gnome/sources/geocode-glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a";
};
@ -24,8 +24,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = "geocode-glib";
attrPath = "gnome3.geocode-glib";
packageName = pname;
};
};

0
pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch → pkgs/development/libraries/geocode-glib/installed-tests-path.patch
View File

2
pkgs/top-level/all-packages.nix
View File

@ -9806,6 +9806,8 @@ in
geoclue2 = callPackage ../development/libraries/geoclue {};
geocode-glib = callPackage ../development/libraries/geocode-glib {};
geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) {
drvName = "geoip-tools";
geoipDatabase = geolite-legacy;