From c816bbc8a86c7ea6c09ca42e1694fe08003a55fc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 17 May 2017 14:26:11 -0500 Subject: qt5: remove makeQtWrapper --- pkgs/applications/office/skrooge/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'pkgs/applications/office/skrooge') diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index acf60bd03755..38ec107bcf73 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchurl, cmake, extra-cmake-modules, makeQtWrapper, qtwebkit, qtscript, grantlee, +{ mkDerivation, lib, fetchurl, + cmake, extra-cmake-modules, qtwebkit, qtscript, grantlee, kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin, kiconthemes, knewstuff, sqlcipher, qca-qt5, kdelibs4support, kactivities, knotifyconfig, krunner, libofx }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "skrooge-${version}"; version = "2.7.0"; @@ -12,21 +13,14 @@ stdenv.mkDerivation rec { sha256 = "1xrh9nal122rzlv4m0x8qah6zpqb6891al3351piarpk2xgjgj4x"; }; - nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ]; + nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5 kdelibs4support kactivities knotifyconfig krunner libofx ]; - enableParallelBuilding = true; - - postInstall = '' - wrapQtProgram "$out/bin/skrooge" - wrapQtProgram "$out/bin/skroogeconvert" - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "A personal finances manager, powered by KDE"; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ joko ]; -- cgit v1.2.3