Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'

1 files changed, 17 insertions, 10 deletions

diff --git a/nixpkgs/pkgs/development/libraries/geoip/default.nix b/nixpkgs/pkgs/development/libraries/geoip/default.nix
index 8747433047c6..4b12871e5567 100644
--- a/nixpkgs/pkgs/development/libraries/geoip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/geoip/default.nix
@@ -1,24 +1,29 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
 , drvName ? "geoip"
 
-# in geoipDatabase, you can insert a package defining
-# "${geoipDatabase}/share/GeoIP" e.g. geolite-legacy
+  # in geoipDatabase, you can insert a package defining
+  # "${geoipDatabase}/share/GeoIP" e.g. geolite-legacy
 , geoipDatabase ? "/var/lib/geoip-databases"
 }:
 
 let
-  dataDir = if lib.isDerivation geoipDatabase
+  dataDir =
+    if 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";
   };
 
@@ -35,11 +40,13 @@ stdenv.mkDerivation rec {
     find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \;
   '';
 
+  passthru = { inherit dataDir; };
+
   meta = with lib; {
     description = "An API for GeoIP/Geolocation databases";
     maintainers = with maintainers; [ thoughtpolice raskin ];
-    license     = licenses.lgpl21;
-    platforms   = platforms.unix;
-    homepage    = "https://www.maxmind.com";
+    license = licenses.lgpl21;
+    platforms = platforms.unix;
+    homepage = "https://www.maxmind.com";
   };
 }