diff options
author | Austin Seipp <aseipp@pobox.com> | 2019-10-21 19:31:20 -0500 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2019-10-21 19:35:01 -0500 |
commit | 2c858f06aa99830f50b5caa60e006a3198e3815c (patch) | |
tree | 4cab24408b58fc3954bbab8b8d688cf32ba842f1 /pkgs/development/libraries/geoip | |
parent | c2eed8b9b08b0c435b6674bf052433de946fefe4 (diff) | |
download | nixpkgs-2c858f06aa99830f50b5caa60e006a3198e3815c.tar nixpkgs-2c858f06aa99830f50b5caa60e006a3198e3815c.tar.gz nixpkgs-2c858f06aa99830f50b5caa60e006a3198e3815c.tar.bz2 nixpkgs-2c858f06aa99830f50b5caa60e006a3198e3815c.tar.lz nixpkgs-2c858f06aa99830f50b5caa60e006a3198e3815c.tar.xz nixpkgs-2c858f06aa99830f50b5caa60e006a3198e3815c.tar.zst nixpkgs-2c858f06aa99830f50b5caa60e006a3198e3815c.zip |
geoip: spruce it up a bit
Update metadata (dead URL), add myself as a maintainer, and do some minor touchups, including moving to `pname+version`. Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs/development/libraries/geoip')
-rw-r--r-- | pkgs/development/libraries/geoip/default.nix | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index 1b1f7373709..4525f923286 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -1,37 +1,45 @@ -# in geoipDatabase, you can insert a package defining ${geoipDatabase}/share/GeoIP -# e.g. geolite-legacy { stdenv, fetchFromGitHub, autoreconfHook -, drvName ? "geoip", geoipDatabase ? "/var/lib/geoip-databases" }: +, drvName ? "geoip" -let version = "1.6.12"; - dataDir = if (stdenv.lib.isDerivation geoipDatabase) then "${toString geoipDatabase}/share/GeoIP" else geoipDatabase; -in stdenv.mkDerivation { - name = "${drvName}-${version}"; +# in geoipDatabase, you can insert a package defining +# "${geoipDatabase}/share/GeoIP" e.g. geolite-legacy +, geoipDatabase ? "/var/lib/geoip-databases" +}: + +let + dataDir = if stdenv.lib.isDerivation geoipDatabase + then "${toString geoipDatabase}/share/GeoIP" + else geoipDatabase; +in +stdenv.mkDerivation rec { + pname = drvName; + version = "1.6.12"; src = fetchFromGitHub { - owner = "maxmind"; - repo = "geoip-api-c"; - rev = "v${version}"; + owner = "maxmind"; + repo = "geoip-api-c"; + rev = "v${version}"; sha256 = "0ixyp3h51alnncr17hqp1p0rlqz9w69nlhm60rbzjjz3vjx52ajv"; }; nativeBuildInputs = [ autoreconfHook ]; + # Cross compilation shenanigans configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; + # Fix up the default data directory postConfigure = '' find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \; ''; - meta = { - description = "Geolocation API"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.unix; - homepage = http://geolite.maxmind.com/; - downloadPage = "http://geolite.maxmind.com/download/"; + meta = with stdenv.lib; { + description = "An API for GeoIP/Geolocation databases"; + maintainers = with maintainers; [ thoughtpolice raskin ]; + license = licenses.lgpl21; + platforms = platforms.unix; + homepage = "http://maxmind.com"; }; } |