summary refs log tree commit diff
path: root/pkgs/desktops/kde-4.14/kdelibs
diff options
context:
space:
mode:
authorambrop7@gmail.com <Ambroz Bizjak>2014-09-21 12:43:05 +0200
committerambrop7@gmail.com <Ambroz Bizjak>2014-09-24 23:48:39 +0200
commit91a41170e4c66724397b4006929cf23785048ee3 (patch)
treec8917219c4847cd7883bb80223d79f39489d249b /pkgs/desktops/kde-4.14/kdelibs
parent9c9f69485319ec0f2172c73c8c4bbf8e5eb43ee5 (diff)
downloadnixpkgs-91a41170e4c66724397b4006929cf23785048ee3.tar
nixpkgs-91a41170e4c66724397b4006929cf23785048ee3.tar.gz
nixpkgs-91a41170e4c66724397b4006929cf23785048ee3.tar.bz2
nixpkgs-91a41170e4c66724397b4006929cf23785048ee3.tar.lz
nixpkgs-91a41170e4c66724397b4006929cf23785048ee3.tar.xz
nixpkgs-91a41170e4c66724397b4006929cf23785048ee3.tar.zst
nixpkgs-91a41170e4c66724397b4006929cf23785048ee3.zip
kde-4.14: Initial porting.
Nix evaulation succeeds (but probably not building everything).
Diffstat (limited to 'pkgs/desktops/kde-4.14/kdelibs')
-rw-r--r--pkgs/desktops/kde-4.14/kdelibs/baloo-widgets.nix11
-rw-r--r--pkgs/desktops/kde-4.14/kdelibs/baloo.nix18
-rw-r--r--pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix1
-rw-r--r--pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix14
4 files changed, 43 insertions, 1 deletions
diff --git a/pkgs/desktops/kde-4.14/kdelibs/baloo-widgets.nix b/pkgs/desktops/kde-4.14/kdelibs/baloo-widgets.nix
new file mode 100644
index 00000000000..46567b5e2a7
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdelibs/baloo-widgets.nix
@@ -0,0 +1,11 @@
+{ stdenv, kde, kdelibs, baloo, kfilemetadata, pkgconfig }:
+
+kde {
+  buildInputs = [ kdelibs baloo kfilemetadata ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "Baloo Widgets";
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/desktops/kde-4.14/kdelibs/baloo.nix b/pkgs/desktops/kde-4.14/kdelibs/baloo.nix
new file mode 100644
index 00000000000..0976639e803
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdelibs/baloo.nix
@@ -0,0 +1,18 @@
+{ stdenv, kde, kdelibs, pkgconfig, doxygen, kdepimlibs, xapian, qjson, akonadi, kfilemetadata
+}:
+
+kde {
+
+# TODO: qmobipocket
+
+  buildInputs = [
+    kdelibs kdepimlibs xapian qjson akonadi kfilemetadata
+  ];
+
+  nativeBuildInputs = [ pkgconfig doxygen ];
+
+  meta = {
+    description = "Baloo";
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix b/pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix
index 5db693e6ea0..4207dfd5654 100644
--- a/pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix
+++ b/pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix
@@ -30,7 +30,6 @@ kde {
 
   patches = [
     ../files/polkit-install.patch
-    ../files/kdelibs-cve-2014-5033.patch  # Security patch, remove when updating to 4.14.0 or more
   ];
 
   cmakeFlags = [
diff --git a/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix b/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix
new file mode 100644
index 00000000000..48f535549ce
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix
@@ -0,0 +1,14 @@
+{ stdenv, kde, kdelibs, pkgconfig, doxygen, popplerQt4, taglib, exiv2, ffmpeg }:
+
+kde {
+  buildInputs = [
+    kdelibs popplerQt4 taglib exiv2 ffmpeg
+  ];
+
+  nativeBuildInputs = [ pkgconfig doxygen ];
+
+  meta = {
+    description = "KFileMetaData";
+    license = stdenv.lib.licenses.gpl2;
+  };
+}