diff options
| author | Peter Simons <simons@cryp.to> | 2019-12-10 11:00:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 11:00:16 +0100 |
| commit | 9be0d6d4ae944e22796c1fca5380d8408e75cf68 (patch) | |
| tree | 40e1e34177140f3df3b9f55ccdea446c5cb50ae7 /pkgs/development/r-modules | |
| parent | 963e635dc9381d63fef1ffed36a60d6683534bb8 (diff) | |
| parent | 350d358dea6101b626d6482c6b767edf3af72b93 (diff) | |
| download | nixpkgs-9be0d6d4ae944e22796c1fca5380d8408e75cf68.tar nixpkgs-9be0d6d4ae944e22796c1fca5380d8408e75cf68.tar.gz nixpkgs-9be0d6d4ae944e22796c1fca5380d8408e75cf68.tar.bz2 nixpkgs-9be0d6d4ae944e22796c1fca5380d8408e75cf68.tar.lz nixpkgs-9be0d6d4ae944e22796c1fca5380d8408e75cf68.tar.xz nixpkgs-9be0d6d4ae944e22796c1fca5380d8408e75cf68.tar.zst nixpkgs-9be0d6d4ae944e22796c1fca5380d8408e75cf68.zip | |
Merge pull request #75021 from mnacamura/r-websocket
rPackages.websocket: fix build
Diffstat (limited to 'pkgs/development/r-modules')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index f1a9a9e0e41..2019ee45f3c 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -853,6 +853,11 @@ let PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -lssl -lcrypto"; }); + websocket = old.websocket.overrideDerivation (attrs: { + PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include"; + PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -lssl -lcrypto"; + }); + Rserve = old.Rserve.overrideDerivation (attrs: { patches = [ ./patches/Rserve.patch ]; configureFlags = [ |