diff options
author | Tobias Mayer <tobim@fastmail.fm> | 2019-07-20 21:24:12 +0200 |
---|---|---|
committer | Tobias Mayer <tobim@fastmail.fm> | 2019-12-31 15:05:13 +0100 |
commit | cdbf3f78bfd1f88259116f6f7cbcc6c5df0a9687 (patch) | |
tree | 24f1c2cae777e104b7788306cee3f0a0f1424adc /pkgs/development/libraries/arrow-cpp | |
parent | 207db019cefd27b20e16609384ce1aedf998c991 (diff) | |
download | nixpkgs-cdbf3f78bfd1f88259116f6f7cbcc6c5df0a9687.tar nixpkgs-cdbf3f78bfd1f88259116f6f7cbcc6c5df0a9687.tar.gz nixpkgs-cdbf3f78bfd1f88259116f6f7cbcc6c5df0a9687.tar.bz2 nixpkgs-cdbf3f78bfd1f88259116f6f7cbcc6c5df0a9687.tar.lz nixpkgs-cdbf3f78bfd1f88259116f6f7cbcc6c5df0a9687.tar.xz nixpkgs-cdbf3f78bfd1f88259116f6f7cbcc6c5df0a9687.tar.zst nixpkgs-cdbf3f78bfd1f88259116f6f7cbcc6c5df0a9687.zip |
arrow-cpp: add lib parameter
Diffstat (limited to 'pkgs/development/libraries/arrow-cpp')
-rw-r--r-- | pkgs/development/libraries/arrow-cpp/default.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 587311a8cc3..87684a4bbe4 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, fixDarwinDylibNames, autoconf, boost +{ stdenv, lib, fetchurl, fetchFromGitHub, fixDarwinDylibNames, autoconf, boost , brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl , python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd , enableShared ? true }: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { patches = [ # patch to fix python-test ./darwin.patch - ] ++ stdenv.lib.optionals (!enableShared) [ + ] ++ lib.optionals (!enableShared) [ # The shared jemalloc lib is unused and breaks in static mode due to missing -fpic. ./jemalloc-disable-shared.patch ]; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { cmake autoconf # for vendored jemalloc flatbuffers - ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ boost brotli @@ -78,23 +78,23 @@ in stdenv.mkDerivation rec { # Disable Python for static mode because openblas is currently broken there. "-DARROW_PYTHON=${if enableShared then "ON" else "OFF"}" "-Duriparser_SOURCE=SYSTEM" - ] ++ stdenv.lib.optionals (!enableShared) [ + ] ++ lib.optionals (!enableShared) [ "-DARROW_BUILD_SHARED=OFF" "-DARROW_TEST_LINKAGE=static" "-DOPENSSL_USE_STATIC_LIBS=ON" - ] ++ stdenv.lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF"; + ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF"; doInstallCheck = true; PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null; installCheckInputs = [ perl which ]; - installCheckPhase = (stdenv.lib.optionalString stdenv.isDarwin '' + installCheckPhase = (lib.optionalString stdenv.isDarwin '' for f in release/*test{,s}; do install_name_tool -add_rpath "$out"/lib "$f" done '') + (let - excludedTests = stdenv.lib.optionals stdenv.isDarwin [ + excludedTests = lib.optionals stdenv.isDarwin [ # Some plasma tests need to be patched to use a shorter AF_UNIX socket # path on Darwin. See https://github.com/NixOS/nix/pull/1085 "plasma-external-store-tests" @@ -108,8 +108,8 @@ in stdenv.mkDerivation rec { meta = { description = "A cross-language development platform for in-memory data"; homepage = "https://arrow.apache.org/"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ tobim veprbl ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ tobim veprbl ]; }; } |