diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-17 14:26:11 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:44:42 -0500 |
| commit | c816bbc8a86c7ea6c09ca42e1694fe08003a55fc (patch) | |
| tree | 036a3c0d8a3a6a4be068cf153a863fc0114ef28f /pkgs/applications/editors/kdevelop5 | |
| parent | 1607f51613fc63a6fbfc1884c55a9efea06161b3 (diff) | |
qt5: remove makeQtWrapper
Diffstat (limited to 'pkgs/applications/editors/kdevelop5')
| -rw-r--r-- | pkgs/applications/editors/kdevelop5/kdevelop.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/editors/kdevelop5/kdevplatform.nix | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index d4f07d82bf0..bbd9be22074 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, wrapGAppsHook +{ mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules , qtquickcontrols, qtwebkit, qttools, kde-cli-tools , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor @@ -21,7 +21,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - cmake gettext pkgconfig extra-cmake-modules makeWrapper wrapGAppsHook + cmake gettext pkgconfig extra-cmake-modules makeWrapper ]; buildInputs = [ diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix index d3680aff3d8..3efc1335c07 100644 --- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix +++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper +{ stdenv, fetchurl, fetchpatch, cmake, gettext, pkgconfig, extra-cmake-modules , boost, subversion, apr, aprutil , qtscript, qtwebkit, grantlee, karchive, kconfig, kcoreaddons, kguiaddons, kiconthemes, ki18n , kitemmodels, kitemviews, kio, kparts, sonnet, kcmutils, knewstuff, knotifications @@ -11,7 +11,7 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - + src = fetchurl { url = "mirror://kde/stable/kdevelop/${version}/src/${name}.tar.xz"; sha256 = "3159440512b1373c1a4b35f401ba1f81217de9578372b45137af141eeda6e726"; @@ -25,9 +25,8 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ]; + nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules ]; - propagatedBuildInputs = [ ]; buildInputs = [ boost subversion apr aprutil qtscript qtwebkit grantlee karchive kconfig kcoreaddons kguiaddons kiconthemes |