public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt5: rename qmakeHook to qmake

Browse Source
This commit is contained in:
Thomas Tuegel
2017-06-18 08:41:57 -05:00
parent 3f3d33a078
commit 210f688802
65 changed files with 165 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/rstudio/default.nix
+3 -2
View File
@@ -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;