pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, cmake, boost, zlib}:
|
||||
{lib, stdenv, fetchurl, cmake, boost, zlib}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "clucene-core-2.3.3.4";
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
"-DBUILD_CONTRIBS=ON"
|
||||
"-DBUILD_CONTRIBS_LIB=ON"
|
||||
"-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
|
||||
] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"-D_CL_HAVE_GCC_ATOMIC_FUNCTIONS=0"
|
||||
"-D_CL_HAVE_NAMESPACES_EXITCODE=0"
|
||||
"-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE=0"
|
||||
@@ -30,15 +30,15 @@ stdenv.mkDerivation rec {
|
||||
[ ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch
|
||||
./Fixing_ZLIB_configuration_in_shared_CMakeLists.patch
|
||||
./Install-contribs-lib.patch
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ];
|
||||
] ++ lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ];
|
||||
|
||||
# fails with "Unable to find executable:
|
||||
# /build/clucene-core-2.3.3.4/build/bin/cl_test"
|
||||
doCheck = false;
|
||||
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Core library for full-featured text search engine";
|
||||
longDescription = ''
|
||||
CLucene is a high-performance, scalable, cross platform, full-featured,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl}:
|
||||
{lib, stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "clucene-core-0.9.21b";
|
||||
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [ ./gcc6.patch ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Core library for full-featured text search engine";
|
||||
longDescription = ''
|
||||
CLucene is a high-performance, scalable, cross platform, full-featured,
|
||||
|
||||
Reference in New Issue
Block a user