Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 859bc7b65a73
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e6fe2df74ff3
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jul 2, 2019

  1. arrow-cpp: add fixDarwinDylibNames 

    (cherry picked from commit e884852)

cc #64144
    @veprbl
    veprbl committed Jul 2, 2019
    Copy the full SHA
    e6fe2df View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 pkgs/development/libraries/arrow-cpp/default.nix
5 changes: 3 additions & 2 deletions pkgs/development/libraries/arrow-cpp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }:
{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, fixDarwinDylibNames, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }:

let
parquet-testing = fetchFromGitHub {
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
./darwin.patch
];

nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ];
nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ boost double-conversion glog python.pkgs.python python.pkgs.numpy ];

preConfigure = ''