BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #241051 from fortuneteller2k/r-pbdZMQ

Browse source 
rPackages.pbdZMQ: use zeromq from nixpkgs instead of vendored copy
This commit is contained in:
Justin Bedő 2023-07-06 15:10:46 +10:00 committed by GitHub
commit 3ad6bfde45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/r-modules/default.nix
View file

@ -371,7 +371,7 @@ let
pander = with pkgs; [ pandoc which ]; pander = with pkgs; [ pandoc which ];
pbdMPI = [ pkgs.mpi ]; pbdMPI = [ pkgs.mpi ];
pbdPROF = [ 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 ]; pdftools = [ pkgs.poppler.dev ];
phytools = [ pkgs.which ]; phytools = [ pkgs.which ];
PKI = [ pkgs.openssl.dev ]; PKI = [ pkgs.openssl.dev ];
@ -503,7 +503,7 @@ let
svKomodo = [ pkgs.which ]; svKomodo = [ pkgs.which ];
nat = [ pkgs.which ]; nat = [ pkgs.which ];
nat_templatebrains = [ 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 ]; bigmemory = lib.optionals stdenv.isLinux [ pkgs.libuuid.dev ];
clustermq = [ pkgs.pkg-config ]; clustermq = [ pkgs.pkg-config ];
RMark = [ pkgs.which ]; RMark = [ pkgs.which ];