Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'

1 files changed, 25 insertions, 17 deletions

diff --git a/nixpkgs/pkgs/development/libraries/geoip/default.nix b/nixpkgs/pkgs/development/libraries/geoip/default.nix
index 1b1f7373709f..d55983952b8c 100644
--- a/nixpkgs/pkgs/development/libraries/geoip/default.nix
+++ b/nixpkgs/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    = "https://www.maxmind.com";
   };
 }