diff options
author | Peter Simons <simons@cryp.to> | 2018-11-04 11:51:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-04 11:51:03 +0100 |
commit | 4a7cdf4be2b2aa14fdccf0e4cbbebda247921396 (patch) | |
tree | 4ef1ea2917b925e6e2f2c1d36e578929dea8b2fc /pkgs/top-level | |
parent | 7ca7e89fc198e8e61d39146c9b87e0292b2d3881 (diff) | |
parent | c93caa5a672da36fdc0052b718c9030c9cfc3c06 (diff) | |
download | nixpkgs-4a7cdf4be2b2aa14fdccf0e4cbbebda247921396.tar nixpkgs-4a7cdf4be2b2aa14fdccf0e4cbbebda247921396.tar.gz nixpkgs-4a7cdf4be2b2aa14fdccf0e4cbbebda247921396.tar.bz2 nixpkgs-4a7cdf4be2b2aa14fdccf0e4cbbebda247921396.tar.lz nixpkgs-4a7cdf4be2b2aa14fdccf0e4cbbebda247921396.tar.xz nixpkgs-4a7cdf4be2b2aa14fdccf0e4cbbebda247921396.tar.zst nixpkgs-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.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91e78f8d28e..172f9754bc9 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); |