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

Merge pull request #7401 from bendlas/geoip-database

Browse Source 
geoip: Install geolite database by default
This commit is contained in:
Tobias Geerinckx-Rice 2015-05-10 22:20:44 +02:00
commit 029db1fdf4
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/geoip/default.nix
View File

@ -1,15 +1,24 @@
{ stdenv, fetchurl }: # in geoipDatabase, you can insert a package defining ${geoipDatabase}/share/GeoIP
# e.g. geolite-legacy
{ stdenv, fetchurl, pkgs, drvName ? "geoip", geoipDatabase ? null }:
let version = "1.6.2"; in let version = "1.6.2"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "geoip-${version}"; name = "${drvName}-${version}";
src = fetchurl { src = fetchurl {
url = "http://geolite.maxmind.com/download/geoip/api/c/GeoIP-${version}.tar.gz"; url = "http://geolite.maxmind.com/download/geoip/api/c/GeoIP-${version}.tar.gz";
sha256 = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7"; sha256 = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7";
}; };
postInstall = ''
DB=${toString geoipDatabase}
if [ -n "$DB" ]; then
ln -s $DB/share/GeoIP $out/share/GeoIP
fi
'';
meta = { meta = {
description = "Geolocation API"; description = "Geolocation API";
maintainers = [ stdenv.lib.maintainers.raskin ]; maintainers = [ stdenv.lib.maintainers.raskin ];

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

@ -5870,6 +5870,11 @@ let
geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {}; geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {};
geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) {
drvName = "geoip-tools";
geoipDatabase = geolite-legacy;
};
geoip = callPackage ../development/libraries/geoip { }; geoip = callPackage ../development/libraries/geoip { };
geoipjava = callPackage ../development/libraries/java/geoipjava { }; geoipjava = callPackage ../development/libraries/java/geoipjava { };