pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #241051 from fortuneteller2k/r-pbdZMQ

rPackages.pbdZMQ: use zeromq from nixpkgs instead of vendored copy

authored by

Justin Bedő and committed by
GitHub 3ad6bfde c0e8d023

+2 -2
unified split
+2 -2
pkgs/development/r-modules/default.nix
··· 371 371 pander = with pkgs; [ pandoc which ]; 372 372 pbdMPI = [ pkgs.mpi ]; 373 373 pbdPROF = [ pkgs.mpi ]; 374 - pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.which ]; 374 + pbdZMQ = [ pkgs.pkg-config ] ++ lib.optionals stdenv.isDarwin [ pkgs.which ]; 375 375 pdftools = [ pkgs.poppler.dev ]; 376 376 phytools = [ pkgs.which ]; 377 377 PKI = [ pkgs.openssl.dev ]; ··· 503 503 svKomodo = [ pkgs.which ]; 504 504 nat = [ pkgs.which ]; 505 505 nat_templatebrains = [ pkgs.which ]; 506 - pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ]; 506 + pbdZMQ = [ pkgs.zeromq ] ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ]; 507 507 bigmemory = lib.optionals stdenv.isLinux [ pkgs.libuuid.dev ]; 508 508 clustermq = [ pkgs.pkg-config ]; 509 509 RMark = [ pkgs.which ];