Unverified Commit 7a7403ae authored by Justin Bedő's avatar Justin Bedő Committed by GitHub
Browse files

Merge pull request #294933 from philipp-baumann/fix2_rPackages.arrow_14.0.0.2

rPackages.arrow: match arrow-cpp source state and fix build for darwin
parents e8ef2cee 470a4906
Loading
Loading
Loading
Loading
+22 −7
Original line number Diff line number Diff line
@@ -313,9 +313,9 @@ let

  packagesWithNativeBuildInputs = {
    adbcpostgresql = [ pkgs.postgresql ];
    arrow = [ pkgs.pkg-config pkgs.arrow-cpp ];
    adimpro = [ pkgs.imagemagick ];
    animation = [ pkgs.which ];
    arrow = with pkgs; [ pkg-config cmake ] ++ lib.optionals stdenv.isDarwin [ intltool ];
    audio = [ pkgs.portaudio ];
    BayesSAE = [ pkgs.gsl ];
    BayesVarSel = [ pkgs.gsl ];
@@ -1017,6 +1017,27 @@ let
  ];

  otherOverrides = old: new: {
    # it can happen that the major version of arrow-cpp is ahead of the
    # rPackages.arrow that would be built from CRAN sources; therefore, to avoid
    # build failures and manual updates of the hash, we use the R source at
    # the GitHub release state of libarrow (arrow-cpp) in Nixpkgs. This may
    # not exactly represent the CRAN sources, but because patching of the
    # CRAN R package is mostly done to meet special CRAN build requirements,
    # this is a straightforward approach. Example where patching was necessary
    # -> arrow 14.0.0.2 on CRAN; was lagging behind libarrow release:
    #   https://github.com/apache/arrow/issues/39698 )
    arrow = old.arrow.overrideAttrs (attrs: {
      src = pkgs.arrow-cpp.src;
      name = "r-arrow-${pkgs.arrow-cpp.version}";
      prePatch = "cd r";
      postPatch = ''
        patchShebangs configure
      '';
      buildInputs = attrs.buildInputs ++ [
        pkgs.arrow-cpp
      ];
    });

    gifski = old.gifski.overrideAttrs (attrs: {
      cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
        src = attrs.src;
@@ -1476,12 +1497,6 @@ let
      '';
    });

    arrow = old.arrow.overrideAttrs (attrs: {
      preConfigure = ''
        patchShebangs configure
      '';
    });

    ROracle = old.ROracle.overrideAttrs (attrs: {
      configureFlags = [
        "--with-oci-lib=${pkgs.oracle-instantclient.lib}/lib"