pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook
|
||||
, drvName ? "geoip"
|
||||
|
||||
# in geoipDatabase, you can insert a package defining
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
dataDir = if stdenv.lib.isDerivation geoipDatabase
|
||||
dataDir = if lib.isDerivation geoipDatabase
|
||||
then "${toString geoipDatabase}/share/GeoIP"
|
||||
else geoipDatabase;
|
||||
in
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
# Cross compilation shenanigans
|
||||
configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"ac_cv_func_malloc_0_nonnull=yes"
|
||||
"ac_cv_func_realloc_0_nonnull=yes"
|
||||
];
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \;
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "An API for GeoIP/Geolocation databases";
|
||||
maintainers = with maintainers; [ thoughtpolice raskin ];
|
||||
license = licenses.lgpl21;
|
||||
|
||||
Reference in New Issue
Block a user