rstudio: fix build
This commit is contained in:
parent
d25a9f57e3
commit
fecc1f8b70
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue