summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/editors/rstudio
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-06-02 10:40:19 -0500
committerThomas Tuegel <ttuegel@mailbox.org>2017-06-18 08:41:57 -0500
commit210f6888023c1df8aff2d053a5e41f5e1effdfe7 (patch)
tree376b0af02afa925c84a968cfcc74d296b6a09f6e /pkgs/applications/editors/rstudio
parent3f3d33a07867116446ec9b5e2675ef1c8de8127d (diff)
qt5: rename qmakeHook to qmake
Diffstat (limited to 'pkgs/applications/editors/rstudio')
-rw-r--r--pkgs/applications/editors/rstudio/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index eab1228da1ac..9ac91e7086ab 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -10,7 +10,8 @@ in
stdenv.mkDerivation rec {
name = "RStudio-${version}";
- buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit qt5.qmakeHook libuuid unzip ant jdk makeWrapper pandoc ];
+ 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";
@@ -90,7 +91,7 @@ stdenv.mkDerivation rec {
cp ${pandoc}/bin/pandoc dependencies/common/pandoc/
'';
- cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=${qt5.qmakeHook}/bin/qmake" ];
+ cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=${qt5.qmake}/bin/qmake" ];
desktopItem = makeDesktopItem {
name = name;