From fecc1f8b70b6fe4bd296956e04f034c4e6f0011a Mon Sep 17 00:00:00 2001 From: mingchuan Date: Sun, 20 Aug 2017 17:35:01 +0800 Subject: [PATCH] rstudio: fix build --- pkgs/applications/editors/rstudio/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 9ac91e7086ab..efb0a6f624d8 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;