diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-02 10:40:19 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:41:57 -0500 |
| commit | 210f6888023c1df8aff2d053a5e41f5e1effdfe7 (patch) | |
| tree | 376b0af02afa925c84a968cfcc74d296b6a09f6e /pkgs/applications/editors | |
| parent | 3f3d33a07867116446ec9b5e2675ef1c8de8127d (diff) | |
| download | nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.tar nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.tar.gz nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.tar.bz2 nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.tar.lz nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.tar.xz nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.tar.zst nixlib-210f6888023c1df8aff2d053a5e41f5e1effdfe7.zip | |
qt5: rename qmakeHook to qmake
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/rstudio/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/editors/tiled/default.nix | 4 |
2 files changed, 5 insertions, 4 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; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index be518b9336a8..9bfa3998926f 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmakeHook +{ stdenv, fetchFromGitHub, pkgconfig, qmake , python, qtbase, qttools, zlib }: let @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "087jl36g6w2g5l70gz573iwyvx3r7i8fijl3y4mmmf8pyqdyq1n2"; }; - nativeBuildInputs = [ pkgconfig qmakeHook ]; + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ python qtbase qttools ]; enableParallelBuilding = true; |