From 8b4f5376ff1f1ad6898febe99941bd9a4c890f6b Mon Sep 17 00:00:00 2001 From: Volth Date: Sat, 15 Jul 2017 21:50:30 +0000 Subject: [PATCH] geoip: set default dir to '/var/lib/geoip-databases' --- pkgs/development/libraries/geoip/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index bf671ebecd1..60d40b10aa4 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -1,10 +1,10 @@ # in geoipDatabase, you can insert a package defining ${geoipDatabase}/share/GeoIP # e.g. geolite-legacy -{ stdenv, fetchurl, pkgs, drvName ? "geoip", geoipDatabase ? null }: +{ stdenv, fetchurl, pkgs, drvName ? "geoip", geoipDatabase ? "/var/lib/geoip-databases" }: -let version = "1.6.2"; in - -stdenv.mkDerivation { +let version = "1.6.2"; + dataDir = if (stdenv.lib.isDerivation geoipDatabase) then "${toString geoipDatabase}/share/GeoIP" else geoipDatabase; +in stdenv.mkDerivation { name = "${drvName}-${version}"; src = fetchurl { @@ -12,11 +12,8 @@ stdenv.mkDerivation { sha256 = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7"; }; - postInstall = '' - DB=${toString geoipDatabase} - if [ -n "$DB" ]; then - ln -s $DB/share/GeoIP $out/share/GeoIP - fi + postPatch = '' + find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \; ''; meta = {