diff options
| author | fortuneteller2k <lythe1107@gmail.com> | 2023-07-02 15:08:06 +0800 |
|---|---|---|
| committer | fortuneteller2k <lythe1107@gmail.com> | 2023-07-04 18:27:28 +0800 |
| commit | 7a1ff1ae896c48a18759e3c2db6ddcc4170aef3d (patch) | |
| tree | e07a20d391195c20060b94654a128ebe457e1dfa /pkgs/development/r-modules | |
| parent | 81c202fce61011476879c95c7d2507bc2a3331b6 (diff) | |
| download | nixlib-7a1ff1ae896c48a18759e3c2db6ddcc4170aef3d.tar nixlib-7a1ff1ae896c48a18759e3c2db6ddcc4170aef3d.tar.gz nixlib-7a1ff1ae896c48a18759e3c2db6ddcc4170aef3d.tar.bz2 nixlib-7a1ff1ae896c48a18759e3c2db6ddcc4170aef3d.tar.lz nixlib-7a1ff1ae896c48a18759e3c2db6ddcc4170aef3d.tar.xz nixlib-7a1ff1ae896c48a18759e3c2db6ddcc4170aef3d.tar.zst nixlib-7a1ff1ae896c48a18759e3c2db6ddcc4170aef3d.zip | |
rPackages.pbdZMQ: use zeromq from nixpkgs instead of vendored copy
also fixes aarch64-darwin in the process
Diffstat (limited to 'pkgs/development/r-modules')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 4 |
1 files 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 ]; |