diff options
| author | mingchuan <ming@culpring.com> | 2017-08-20 17:35:01 +0800 |
|---|---|---|
| committer | mingchuan <ming@culpring.com> | 2017-08-20 17:35:33 +0800 |
| commit | fecc1f8b70b6fe4bd296956e04f034c4e6f0011a (patch) | |
| tree | 344bb86d986ede9278c5f570e74c33c4bbb28386 /pkgs/applications/editors/rstudio | |
| parent | d25a9f57e380e780765f9ee54ad86b68515b4b48 (diff) | |
| download | nixpkgs-fecc1f8b70b6fe4bd296956e04f034c4e6f0011a.tar nixpkgs-fecc1f8b70b6fe4bd296956e04f034c4e6f0011a.tar.gz nixpkgs-fecc1f8b70b6fe4bd296956e04f034c4e6f0011a.tar.bz2 nixpkgs-fecc1f8b70b6fe4bd296956e04f034c4e6f0011a.tar.lz nixpkgs-fecc1f8b70b6fe4bd296956e04f034c4e6f0011a.tar.xz nixpkgs-fecc1f8b70b6fe4bd296956e04f034c4e6f0011a.tar.zst nixpkgs-fecc1f8b70b6fe4bd296956e04f034c4e6f0011a.zip | |
rstudio: fix build
Diffstat (limited to 'pkgs/applications/editors/rstudio')
| -rw-r--r-- | pkgs/applications/editors/rstudio/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 9ac91e7086a..efb0a6f624d 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { name = "RStudio-${version}"; buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit libuuid unzip ant jdk makeWrapper pandoc ]; - nativeBuildInputs = [ qt5.qmake ]; src = fetchurl { url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; @@ -91,7 +90,7 @@ stdenv.mkDerivation rec { cp ${pandoc}/bin/pandoc dependencies/common/pandoc/ ''; - cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=${qt5.qmake}/bin/qmake" ]; + cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ]; desktopItem = makeDesktopItem { name = name; |