Separate Qt 5 packages from dependent libraries

2 files changed, 61 insertions, 89 deletions

diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix
index 7f7b22dfa13..ad3300b9221 100644
--- a/pkgs/applications/editors/kile/default.nix
+++ b/pkgs/applications/editors/kile/default.nix
@@ -1,28 +1,68 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, shared_mime_info, kdelibs
+{ kdeDerivation
+, lib
+, fetchgit
+, ecm
+, kdoctools
+, kdeWrapper
+, qtscript
+, kconfig
+, kcrash
+, kdbusaddons
+, kdelibs4support
+, kguiaddons
+, kiconthemes
+, kinit
+, khtml
+, konsole
+, kparts
+, ktexteditor
+, kwindowsystem
+, poppler
 }:
 
-stdenv.mkDerivation rec {
-  name = "kile-2.1.3";
+let
+  unwrapped =
+    kdeDerivation rec {
+      name = "kile-${version}";
+      version = "2017-02-09";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/kile/${name}.tar.bz2";
-    sha256 = "18nfi37s46v9xav7vyki3phasddgcy4m7nywzxis198vr97yqqx0";
-  };
+      src = fetchgit {
+        url = git://anongit.kde.org/kile.git;
+        rev = "f77f6e627487c152f111e307ad6dc71699ade746";
+        sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib";
 
-  nativeBuildInputs = [
-    automoc4 cmake gettext perl pkgconfig shared_mime_info
-  ];
-  buildInputs = [ kdelibs ];
+      };
 
-  # for KDE 4.7 the nl translations fail since kile-2.1.2
-  preConfigure = "rm -r translations/nl";
+      nativeBuildInputs = [ ecm kdoctools ];
 
-  meta = {
-    description = "An integrated LaTeX editor for KDE";
-    homepage = http://kile.sourceforge.net;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-    license = stdenv.lib.licenses.gpl2Plus;
-    inherit (kdelibs.meta) platforms;
-  };
+      buildInputs = [
+        kconfig
+        kcrash
+        kdbusaddons
+        kdelibs4support
+        kdoctools
+        kguiaddons
+        kiconthemes
+        kinit
+        khtml
+        kparts
+        ktexteditor
+        kwindowsystem
+        poppler
+        qtscript
+      ];
+
+      meta = {
+        description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment";
+        homepage = https://www.kde.org/applications/office/kile/;
+        maintainers = with lib.maintainers; [ fridh ];
+        license = lib.licenses.gpl2Plus;
+      };
+    };
+in
+kdeWrapper
+{
+  inherit unwrapped;
+  targets = [ "bin/kile" ];
+  paths = [ konsole.unwrapped ];
 }
diff --git a/pkgs/applications/editors/kile/frameworks.nix b/pkgs/applications/editors/kile/frameworks.nix
deleted file mode 100644
index ad3300b9221..00000000000
--- a/pkgs/applications/editors/kile/frameworks.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ kdeDerivation
-, lib
-, fetchgit
-, ecm
-, kdoctools
-, kdeWrapper
-, qtscript
-, kconfig
-, kcrash
-, kdbusaddons
-, kdelibs4support
-, kguiaddons
-, kiconthemes
-, kinit
-, khtml
-, konsole
-, kparts
-, ktexteditor
-, kwindowsystem
-, poppler
-}:
-
-let
-  unwrapped =
-    kdeDerivation rec {
-      name = "kile-${version}";
-      version = "2017-02-09";
-
-      src = fetchgit {
-        url = git://anongit.kde.org/kile.git;
-        rev = "f77f6e627487c152f111e307ad6dc71699ade746";
-        sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib";
-
-      };
-
-      nativeBuildInputs = [ ecm kdoctools ];
-
-      buildInputs = [
-        kconfig
-        kcrash
-        kdbusaddons
-        kdelibs4support
-        kdoctools
-        kguiaddons
-        kiconthemes
-        kinit
-        khtml
-        kparts
-        ktexteditor
-        kwindowsystem
-        poppler
-        qtscript
-      ];
-
-      meta = {
-        description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment";
-        homepage = https://www.kde.org/applications/office/kile/;
-        maintainers = with lib.maintainers; [ fridh ];
-        license = lib.licenses.gpl2Plus;
-      };
-    };
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/kile" ];
-  paths = [ konsole.unwrapped ];
-}