diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-09-26 21:23:10 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-10-17 03:40:11 +0300 |
| commit | e2a7f508fc2e3ef665ce6a66bd9bc753dfdf13f5 (patch) | |
| tree | a08d348f7926d54031963ff7b7048bb36e78d863 | |
| parent | b1736511cedee31dbc76bf48da1de9904d4825b7 (diff) | |
| download | nixlib-e2a7f508fc2e3ef665ce6a66bd9bc753dfdf13f5.tar nixlib-e2a7f508fc2e3ef665ce6a66bd9bc753dfdf13f5.tar.gz nixlib-e2a7f508fc2e3ef665ce6a66bd9bc753dfdf13f5.tar.bz2 nixlib-e2a7f508fc2e3ef665ce6a66bd9bc753dfdf13f5.tar.lz nixlib-e2a7f508fc2e3ef665ce6a66bd9bc753dfdf13f5.tar.xz nixlib-e2a7f508fc2e3ef665ce6a66bd9bc753dfdf13f5.tar.zst nixlib-e2a7f508fc2e3ef665ce6a66bd9bc753dfdf13f5.zip | |
rstudio: enable parallel building
Also cleanup inputs.
| -rw-r--r-- | pkgs/applications/editors/rstudio/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 80f020b6c503..a5049e4236b3 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -10,7 +10,9 @@ in stdenv.mkDerivation rec { name = "RStudio-${version}"; - buildInputs = [ cmake boost zlib openssl R qt5.full qt5.qtwebkit qt5.qtwebchannel libuuid unzip ant jdk makeWrapper pandoc ]; + nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ]; + + buildInputs = [ boost zlib openssl R qt5.full qt5.qtwebkit qt5.qtwebchannel libuuid ]; src = fetchurl { url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; @@ -96,6 +98,8 @@ stdenv.mkDerivation rec { cp ${pandoc}/bin/pandoc dependencies/common/pandoc/ ''; + enableParallelBuilding = true; + cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ]; desktopItem = makeDesktopItem { |