summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2018-11-04 11:51:03 +0100
committerGitHub <noreply@github.com>2018-11-04 11:51:03 +0100
commit4a7cdf4be2b2aa14fdccf0e4cbbebda247921396 (patch)
tree4ef1ea2917b925e6e2f2c1d36e578929dea8b2fc /pkgs/top-level
parent7ca7e89fc198e8e61d39146c9b87e0292b2d3881 (diff)
parentc93caa5a672da36fdc0052b718c9030c9cfc3c06 (diff)
downloadnixlib-4a7cdf4be2b2aa14fdccf0e4cbbebda247921396.tar
nixlib-4a7cdf4be2b2aa14fdccf0e4cbbebda247921396.tar.gz
nixlib-4a7cdf4be2b2aa14fdccf0e4cbbebda247921396.tar.bz2
nixlib-4a7cdf4be2b2aa14fdccf0e4cbbebda247921396.tar.lz
nixlib-4a7cdf4be2b2aa14fdccf0e4cbbebda247921396.tar.xz
nixlib-4a7cdf4be2b2aa14fdccf0e4cbbebda247921396.tar.zst
nixlib-4a7cdf4be2b2aa14fdccf0e4cbbebda247921396.zip
Merge pull request #49701 from averelld/rstudio-preview
RStudio 1.2 preview init
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91e78f8d28ea..172f9754bc99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18758,6 +18758,10 @@ with pkgs;
   rstudio = libsForQt5.callPackage ../applications/editors/rstudio {
     boost = boost166;
   };
+  rstudio-preview = libsForQt5.callPackage ../applications/editors/rstudio/preview.nix {
+    boost = boost166;
+    llvmPackages = llvmPackages_7;
+  };
 
   rsync = callPackage ../applications/networking/sync/rsync {
     enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD);