From 7a1ff1ae896c48a18759e3c2db6ddcc4170aef3d Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 2 Jul 2023 15:08:06 +0800 Subject: [PATCH] rPackages.pbdZMQ: use zeromq from nixpkgs instead of vendored copy also fixes aarch64-darwin in the process --- pkgs/development/r-modules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 879824fc7467..ad76b9750410 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -371,7 +371,7 @@ let pander = with pkgs; [ pandoc which ]; pbdMPI = [ pkgs.mpi ]; pbdPROF = [ pkgs.mpi ]; - pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.which ]; + pbdZMQ = [ pkgs.pkg-config ] ++ lib.optionals stdenv.isDarwin [ pkgs.which ]; pdftools = [ pkgs.poppler.dev ]; phytools = [ pkgs.which ]; PKI = [ pkgs.openssl.dev ]; @@ -503,7 +503,7 @@ let svKomodo = [ pkgs.which ]; nat = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ]; - pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ]; + pbdZMQ = [ pkgs.zeromq ] ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ]; bigmemory = lib.optionals stdenv.isLinux [ pkgs.libuuid.dev ]; clustermq = [ pkgs.pkg-config ]; RMark = [ pkgs.which ];