From f9e5745efa96057c7c71f4956e225ffc961760d5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 09:45:23 -0500 Subject: [PATCH 01/43] lib: add makeScope --- lib/customisation.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/lib/customisation.nix b/lib/customisation.nix index eaec46276b2..585495469b2 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -164,4 +164,23 @@ rec { drv' = (lib.head outputsList).value; in lib.deepSeq drv' drv'; + /* Make a set of packages with a common scope. All packages called + with the provided `callPackage' will be evaluated with the same + arguments. Any package in the set may depend on any other. The + `override' function allows subsequent modification of the package + set in a consistent way, i.e. all packages in the set will be + called with the overridden packages. The package sets may be + hierarchical: the packages in the set are called with the scope + provided by `newScope' and the set provides a `newScope' attribute + which can form the parent scope for later package sets. */ + makeScope = newScope: f: + let self = f self // { + newScope = scope: newScope (self // scope); + callPackage = self.newScope {}; + override = g: makeScope newScope (self_: + let super = f self_; + in super // g super self_); + }; + in self; + } From e92cbb73e4bade045d228f7b46cba4b4c1c99ac6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 09:45:35 -0500 Subject: [PATCH 02/43] lib.licenses: add fdl13 --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 5769f9e4915..107296089d0 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -155,6 +155,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "GNU Free Documentation License v1.2"; }; + fdl13 = spdx { + spdxId = "GFDL-1.3"; + fullName = "GNU Free Documentation License v1.2"; + }; + free = { fullName = "Unspecified free software license"; }; From fe49213ba6ebcc8b3b5d3695d0454e6338a54598 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 09:46:48 -0500 Subject: [PATCH 03/43] qt55: init at 5.5.0 --- .../libraries/qt-5/5.5/default.nix | 104 +++++++ .../libraries/qt-5/5.5/fetchsrcs.sh | 47 ++++ .../5.5/qtbase/0001-dlopen-gtkstyle.patch | 63 +++++ .../qt-5/5.5/qtbase/0002-dlopen-resolv.patch | 39 +++ .../qt-5/5.5/qtbase/0003-dlopen-gl.patch | 25 ++ .../qt-5/5.5/qtbase/0004-tzdir.patch | 52 ++++ .../5.5/qtbase/0005-dlopen-libXcursor.patch | 29 ++ .../qt-5/5.5/qtbase/0006-dlopen-openssl.patch | 38 +++ .../qt-5/5.5/qtbase/0007-dlopen-dbus.patch | 25 ++ .../5.5/qtbase/0008-xdg-config-dirs.patch | 55 ++++ .../5.5/qtbase/0009-decrypt-ssl-traffic.patch | 25 ++ .../libraries/qt-5/5.5/qtbase/default.nix | 228 +++++++++++++++ .../libraries/qt-5/5.5/qtbase/setup-hook.sh | 109 ++++++++ .../libraries/qt-5/5.5/qtconnectivity.nix | 6 + .../libraries/qt-5/5.5/qtdeclarative.nix | 7 + pkgs/development/libraries/qt-5/5.5/qtdoc.nix | 6 + .../libraries/qt-5/5.5/qtenginio.nix | 6 + .../libraries/qt-5/5.5/qtgraphicaleffects.nix | 6 + .../libraries/qt-5/5.5/qtimageformats.nix | 6 + .../libraries/qt-5/5.5/qtlocation.nix | 6 + .../libraries/qt-5/5.5/qtmultimedia.nix | 11 + .../libraries/qt-5/5.5/qtquick1.nix | 6 + .../libraries/qt-5/5.5/qtquickcontrols.nix | 6 + .../qt-5/5.5/qtscript/0001-glib-2.32.patch | 25 ++ .../libraries/qt-5/5.5/qtscript/default.nix | 7 + .../libraries/qt-5/5.5/qtsensors.nix | 6 + .../0001-dlopen-serialport-udev.patch | 28 ++ .../qt-5/5.5/qtserialport/default.nix | 7 + pkgs/development/libraries/qt-5/5.5/qtsvg.nix | 6 + .../libraries/qt-5/5.5/qttools.nix | 6 + .../libraries/qt-5/5.5/qttranslations.nix | 6 + .../libraries/qt-5/5.5/qtwebkit-examples.nix | 6 + .../0001-dlopen-webkit-nsplugin.patch | 53 ++++ .../5.5/qtwebkit/0002-dlopen-webkit-gtk.patch | 25 ++ .../qtwebkit/0003-dlopen-webkit-udev.patch | 31 +++ .../libraries/qt-5/5.5/qtwebkit/default.nix | 33 +++ .../libraries/qt-5/5.5/qtwebsockets.nix | 6 + .../libraries/qt-5/5.5/qtx11extras.nix | 6 + .../libraries/qt-5/5.5/qtxmlpatterns.nix | 6 + pkgs/development/libraries/qt-5/5.5/srcs.nix | 261 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 41 files changed, 1425 insertions(+) create mode 100644 pkgs/development/libraries/qt-5/5.5/default.nix create mode 100755 pkgs/development/libraries/qt-5/5.5/fetchsrcs.sh create mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch create mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch create mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch create mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch create mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch create mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch create mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch create mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch create mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch create mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh create mode 100644 pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qtdeclarative.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qtdoc.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qtenginio.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qtgraphicaleffects.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qtimageformats.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qtlocation.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qtquick1.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qtquickcontrols.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qtscript/0001-glib-2.32.patch create mode 100644 pkgs/development/libraries/qt-5/5.5/qtscript/default.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qtsensors.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch create mode 100644 pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qtsvg.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qttools.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qttranslations.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qtwebkit/0001-dlopen-webkit-nsplugin.patch create mode 100644 pkgs/development/libraries/qt-5/5.5/qtwebkit/0002-dlopen-webkit-gtk.patch create mode 100644 pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch create mode 100644 pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qtx11extras.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix create mode 100644 pkgs/development/libraries/qt-5/5.5/srcs.nix diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix new file mode 100644 index 00000000000..418ab88cd9f --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -0,0 +1,104 @@ +# Maintainer's Notes: +# +# Minor updates: +# 1. Edit ./manifest.sh to point to the updated URL. +# 2. Run ./manifest.sh. +# 3. Build and enjoy. +# +# Major updates: +# We prefer not to immediately overwrite older versions with major updates, so +# make a copy of this directory first. After copying, be sure to delete ./tmp +# if it exists. Then follow the minor update instructions. Be sure to check if +# any new components have been added and package them as necessary. + +{ pkgs + +# options +, developerBuild ? false +, decryptSslTraffic ? false +}: + +let inherit (pkgs) stdenv; in + +with stdenv.lib; + +let + + mirror = "http://download.qt.io"; + srcs = import ./srcs.nix { inherit mirror; inherit (pkgs) fetchurl; }; + + qtSubmodule = args: + let + inherit (args) name; + inherit (srcs."${args.name}") version src; + inherit (pkgs.stdenv) mkDerivation; + in mkDerivation (args // { + name = "${name}-${version}"; + inherit src; + + propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); + + NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; + dontAddPrefix = args.dontAddPrefix or true; + dontFixLibtool = args.dontFixLibtool or true; + configureScript = args.configureScript or "qmake"; + + enableParallelBuilding = args.enableParallelBuilding or true; + + meta = { + homepage = http://qt-project.org; + description = "A cross-platform application framework for C++"; + license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; + maintainers = with maintainers; [ bbenoist qknight ttuegel ]; + platforms = platforms.linux; + } // (args.meta or {}); + }); + + addPackages = self: with self; + let + callPackage = self.newScope { inherit qtSubmodule srcs; }; + in { + + qtbase = callPackage ./qtbase { + mesa = pkgs.mesa_noglu; + cups = if stdenv.isLinux then pkgs.cups else null; + # GNOME dependencies are not used unless gtkStyle == true + inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; + bison = pkgs.bison2; # error: too few arguments to function 'int yylex(... + inherit developerBuild decryptSslTraffic; + }; + + /* qt3d = not packaged */ + /* qtactiveqt = not packaged */ + /* qtandroidextras = not packaged */ + /* qtcanvas3d = not packaged */ + qtconnectivity = callPackage ./qtconnectivity.nix {}; + qtdeclarative = callPackage ./qtdeclarative.nix {}; + qtdoc = callPackage ./qtdoc.nix {}; + qtenginio = callPackage ./qtenginio.nix {}; + qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {}; + qtimageformats = callPackage ./qtimageformats.nix {}; + qtlocation = callPackage ./qtlocation.nix {}; + /* qtmacextras = not packaged */ + qtmultimedia = callPackage ./qtmultimedia.nix {}; + qtquick1 = callPackage ./qtquick1.nix {}; + qtquickcontrols = callPackage ./qtquickcontrols.nix {}; + qtscript = callPackage ./qtscript {}; + qtsensors = callPackage ./qtsensors.nix {}; + qtserialport = callPackage ./qtserialport {}; + qtsvg = callPackage ./qtsvg.nix {}; + qttools = callPackage ./qttools.nix {}; + qttranslations = callPackage ./qttranslations.nix {}; + /* qtwayland = not packaged */ + /* qtwebchannel = not packaged */ + /* qtwebengine = not packaged */ + qtwebkit = callPackage ./qtwebkit {}; + qtwebkit-examples = callPackage ./qtwebkit-examples.nix {}; + qtwebsockets = callPackage ./qtwebsockets.nix {}; + /* qtwinextras = not packaged */ + qtx11extras = callPackage ./qtx11extras.nix {}; + qtxmlpatterns = callPackage ./qtxmlpatterns.nix {}; + + }; + +in makeScope pkgs.newScope addPackages diff --git a/pkgs/development/libraries/qt-5/5.5/fetchsrcs.sh b/pkgs/development/libraries/qt-5/5.5/fetchsrcs.sh new file mode 100755 index 00000000000..8d48cd38ee4 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/fetchsrcs.sh @@ -0,0 +1,47 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils findutils gnused nix wget + +set -x + +# The trailing slash at the end is necessary! +RELEASE_URL="http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/" +EXTRA_WGET_ARGS='-A *.tar.xz' + +mkdir tmp; cd tmp + +wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS + +cat >../srcs.nix <>../srcs.nix <>../srcs.nix + +cd .. diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch new file mode 100644 index 00000000000..b86dfaf628b --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch @@ -0,0 +1,63 @@ +From d3224286c647f1d1e7dac485bbeee5bc8286e6c6 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:21:58 -0600 +Subject: [PATCH 1/9] dlopen-gtkstyle + +--- + qtbase/src/widgets/styles/qgtk2painter.cpp | 2 +- + qtbase/src/widgets/styles/qgtkstyle_p.cpp | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/qtbase/src/widgets/styles/qgtk2painter.cpp b/qtbase/src/widgets/styles/qgtk2painter.cpp +index 489d456..c38e986 100644 +--- a/qtbase/src/widgets/styles/qgtk2painter.cpp ++++ b/qtbase/src/widgets/styles/qgtk2painter.cpp +@@ -96,7 +96,7 @@ static void initGtk() + static bool initialized = false; + if (!initialized) { + // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 +- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0); ++ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0); + + QGtk2PainterPrivate::gdk_pixmap_new = (Ptr_gdk_pixmap_new)libgtk.resolve("gdk_pixmap_new"); + QGtk2PainterPrivate::gdk_pixbuf_get_from_drawable = (Ptr_gdk_pixbuf_get_from_drawable)libgtk.resolve("gdk_pixbuf_get_from_drawable"); +diff --git a/qtbase/src/widgets/styles/qgtkstyle_p.cpp b/qtbase/src/widgets/styles/qgtkstyle_p.cpp +index 0e119a1..ad6caa1 100644 +--- a/qtbase/src/widgets/styles/qgtkstyle_p.cpp ++++ b/qtbase/src/widgets/styles/qgtkstyle_p.cpp +@@ -327,7 +327,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus(GtkWidget *widget, bool focus) + void QGtkStylePrivate::resolveGtk() const + { + // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 +- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0); ++ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0); + + gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init"); + gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new"); +@@ -425,8 +425,8 @@ void QGtkStylePrivate::resolveGtk() const + pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family"); + pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style"); + +- gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("gnomeui-2"), 0, "gnome_icon_lookup_sync"); +- gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("gnomevfs-2"), 0, "gnome_vfs_init"); ++ gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("@libgnomeui@/lib/libgnomeui-2"), 0, "gnome_icon_lookup_sync"); ++ gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("@gnome_vfs@/lib/libgnomevfs-2"), 0, "gnome_vfs_init"); + } + + /* \internal +@@ -594,9 +594,9 @@ void QGtkStylePrivate::cleanupGtkWidgets() + static bool resolveGConf() + { + if (!QGtkStylePrivate::gconf_client_get_default) { +- QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_default"); +- QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_string"); +- QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_bool"); ++ QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_default"); ++ QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_string"); ++ QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_bool"); + } + return (QGtkStylePrivate::gconf_client_get_default !=0); + } +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch new file mode 100644 index 00000000000..90afce32dc1 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch @@ -0,0 +1,39 @@ +From af315c076c8626292075592fab1726fcd62c3169 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:22:55 -0600 +Subject: [PATCH 2/9] dlopen-resolv + +--- + qtbase/src/network/kernel/qdnslookup_unix.cpp | 2 +- + qtbase/src/network/kernel/qhostinfo_unix.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qtbase/src/network/kernel/qdnslookup_unix.cpp b/qtbase/src/network/kernel/qdnslookup_unix.cpp +index fa782da..912ecc7 100644 +--- a/qtbase/src/network/kernel/qdnslookup_unix.cpp ++++ b/qtbase/src/network/kernel/qdnslookup_unix.cpp +@@ -79,7 +79,7 @@ static void resolveLibrary() + if (!lib.load()) + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String("@glibc/lib/resolv")); + if (!lib.load()) + return; + } +diff --git a/qtbase/src/network/kernel/qhostinfo_unix.cpp b/qtbase/src/network/kernel/qhostinfo_unix.cpp +index 90a6f76..758407a 100644 +--- a/qtbase/src/network/kernel/qhostinfo_unix.cpp ++++ b/qtbase/src/network/kernel/qhostinfo_unix.cpp +@@ -95,7 +95,7 @@ static void resolveLibrary() + if (!lib.load()) + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); + if (!lib.load()) + return; + } +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch new file mode 100644 index 00000000000..a8a0bdf4410 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch @@ -0,0 +1,25 @@ +From fc9f34b6e8a290615868e27bfcd31c355d11487c Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:23:08 -0600 +Subject: [PATCH 3/9] dlopen-gl + +--- + .../plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +index 5166372..bdeb69a 100644 +--- a/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp ++++ b/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +@@ -560,7 +560,7 @@ void (*QGLXContext::getProcAddress(const QByteArray &procName)) () + { + extern const QString qt_gl_library_name(); + // QLibrary lib(qt_gl_library_name()); +- QLibrary lib(QLatin1String("GL")); ++ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL")); + glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); + } + } +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch new file mode 100644 index 00000000000..a4e9cd986a2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch @@ -0,0 +1,52 @@ +From b1a0771652ddf91058f67fa92260a89c43f5c530 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:23:22 -0600 +Subject: [PATCH 4/9] tzdir + +--- + qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +diff --git a/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp b/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp +index 29f0e17..3878974 100644 +--- a/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp ++++ b/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp +@@ -62,7 +62,10 @@ typedef QHash QTzTimeZoneHash; + // Parse zone.tab table, assume lists all installed zones, if not will need to read directories + static QTzTimeZoneHash loadTzTimeZones() + { +- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); ++ QString path = qgetenv("TZDIR"); ++ path += "/zone.tab"; ++ if (!QFile::exists(path)) ++ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); + if (!QFile::exists(path)) + path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); + +@@ -553,12 +556,18 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) + if (!tzif.open(QIODevice::ReadOnly)) + return; + } else { +- // Open named tz, try modern path first, if fails try legacy path +- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ // Try TZDIR first ++ QString zoneinfoDir = qgetenv("TZDIR"); ++ zoneinfoDir += "/" + QString::fromLocal8Bit(ianaId); ++ tzif.setFileName(zoneinfoDir); + if (!tzif.open(QIODevice::ReadOnly)) { +- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); +- if (!tzif.open(QIODevice::ReadOnly)) +- return; ++ // Open named tz, try modern path first, if fails try legacy path ++ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) { ++ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) ++ return; ++ } + } + } + +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch new file mode 100644 index 00000000000..fe53e0e7c48 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch @@ -0,0 +1,29 @@ +From 5fbe717120864d490fa4d60bc7f7676ac19bd69d Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:33:51 -0600 +Subject: [PATCH 5/9] dlopen-libXcursor + +--- + qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp +index e51ab85..7ec4b0b 100644 +--- a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp ++++ b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp +@@ -303,10 +303,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) + #ifdef XCB_USE_XLIB + static bool function_ptrs_not_initialized = true; + if (function_ptrs_not_initialized) { +- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); ++ QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1); + bool xcursorFound = xcursorLib.load(); + if (!xcursorFound) { // try without the version number +- xcursorLib.setFileName(QLatin1String("Xcursor")); ++ xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor")); + xcursorFound = xcursorLib.load(); + } + if (xcursorFound) { +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch new file mode 100644 index 00000000000..718ff08ca43 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch @@ -0,0 +1,38 @@ +From 4c4b1f2a35644014da79d089d3860e518fa9a27d Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 23 Aug 2015 08:52:04 -0500 +Subject: [PATCH 6/9] dlopen openssl + +--- + qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp +index e2700df..a7ccf88 100644 +--- a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp ++++ b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -640,8 +640,8 @@ static QPair loadOpenSsl() + #endif + #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so + // first attempt: the canonical name is libssl.so. +- libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER)); +- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER)); ++ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER)); ++ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER)); + if (libcrypto->load() && libssl->load()) { + // libssl.so. and libcrypto.so. found + return pair; +@@ -658,8 +658,8 @@ static QPair loadOpenSsl() + // OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third + // attempt, _after_ /Contents/Frameworks has been searched. + // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. +- libssl->setFileNameAndVersion(QLatin1String("ssl"), -1); +- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1); ++ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1); ++ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), -1); + if (libcrypto->load() && libssl->load()) { + // libssl.so.0 and libcrypto.so.0 found + return pair; +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch new file mode 100644 index 00000000000..96d268c358b --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch @@ -0,0 +1,25 @@ +From a23141d76cdde068ba1cefdad4a6352c921ce7c9 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 23 Aug 2015 08:52:27 -0500 +Subject: [PATCH 7/9] dlopen dbus + +--- + qtbase/src/dbus/qdbus_symbols.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qtbase/src/dbus/qdbus_symbols.cpp b/qtbase/src/dbus/qdbus_symbols.cpp +index b82d92b..f72c9cb 100644 +--- a/qtbase/src/dbus/qdbus_symbols.cpp ++++ b/qtbase/src/dbus/qdbus_symbols.cpp +@@ -89,7 +89,7 @@ bool qdbus_loadLibDBus() + #ifdef Q_OS_WIN + QLatin1String("dbus-1"), + #endif +- QLatin1String("libdbus-1") ++ QLatin1String("@dbus_libs@/lib/libdbus-1") + }; + + lib->unload(); +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch new file mode 100644 index 00000000000..4d23d640df0 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch @@ -0,0 +1,55 @@ +From a7dc6209542ef8aa54191c0e17fbb9b41cbad67f Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 23 Aug 2015 08:52:57 -0500 +Subject: [PATCH 8/9] xdg config dirs + +--- + qtbase/src/corelib/io/qsettings.cpp | 18 ++++++++++++++++++ + qtbase/src/corelib/io/qsettings_p.h | 2 +- + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/qtbase/src/corelib/io/qsettings.cpp b/qtbase/src/corelib/io/qsettings.cpp +index 413f569..8ff4974 100644 +--- a/qtbase/src/corelib/io/qsettings.cpp ++++ b/qtbase/src/corelib/io/qsettings.cpp +@@ -1131,6 +1131,24 @@ QConfFileSettingsPrivate::QConfFileSettingsPrivate(QSettings::Format format, + if (!application.isEmpty()) + confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false)); + confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false)); ++ ++#if !defined(Q_OS_WIN) ++ // Add directories specified in $XDG_CONFIG_DIRS ++ const QString pathEnv = QString::fromLocal8Bit(getenv("XDG_CONFIG_DIRS")); ++ if (!pathEnv.isEmpty()) { ++ const QStringList pathEntries = pathEnv.split(QLatin1Char(':'), QString::SkipEmptyParts); ++ if (!pathEntries.isEmpty()) { ++ int j = 4; // This is the number of confFiles set above -- we need to start adding $XDG_CONFIG_DIRS after those. ++ for (int k = 0; k < pathEntries.size() && j < NumConfFiles - 1; ++k) { ++ const QString& path = pathEntries.at(k); ++ if (!application.isEmpty()) ++ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + appFile, false)); ++ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + orgFile, false)); ++ } ++ } ++ } ++#endif ++ + #else + QString confName = getPath(format, QSettings::UserScope) + org; + if (!application.isEmpty()) +diff --git a/qtbase/src/corelib/io/qsettings_p.h b/qtbase/src/corelib/io/qsettings_p.h +index 93d63fd..160b197 100644 +--- a/qtbase/src/corelib/io/qsettings_p.h ++++ b/qtbase/src/corelib/io/qsettings_p.h +@@ -240,7 +240,7 @@ public: + F_Organization = 0x1, + F_User = 0x0, + F_System = 0x2, +- NumConfFiles = 4 ++ NumConfFiles = 40 // HACK: increase NumConfFiles from 4 to 40 in order to accommodate more paths in $XDG_CONFIG_DIRS -- ellis + #else + SandboxConfFile = 0, + NumConfFiles = 1 +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch new file mode 100644 index 00000000000..8c8ec697458 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch @@ -0,0 +1,25 @@ +From 64bc88615a4cb58d461fe600b46611415d74b7b2 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 23 Aug 2015 08:53:42 -0500 +Subject: [PATCH 9/9] decrypt ssl traffic + +--- + qtbase/src/network/ssl/qsslsocket_openssl.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qtbase/src/network/ssl/qsslsocket_openssl.cpp b/qtbase/src/network/ssl/qsslsocket_openssl.cpp +index 049666b..e8342ab 100644 +--- a/qtbase/src/network/ssl/qsslsocket_openssl.cpp ++++ b/qtbase/src/network/ssl/qsslsocket_openssl.cpp +@@ -48,7 +48,7 @@ + ****************************************************************************/ + + //#define QSSLSOCKET_DEBUG +-//#define QT_DECRYPT_SSL_TRAFFIC ++#define QT_DECRYPT_SSL_TRAFFIC + + #include "qssl_p.h" + #include "qsslsocket_openssl_p.h" +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix new file mode 100644 index 00000000000..559607e3a9d --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -0,0 +1,228 @@ +{ stdenv, fetchurl, substituteAll, makeWrapper +, srcs + +, xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi +, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon +, fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre +, zlib, libjpeg, libpng, libtiff, sqlite, icu + +, coreutils, bison, flex, gdb, gperf, lndir, ruby +, python, perl, pkgconfig + +# optional dependencies +, cups ? null +, mysql ? null, postgresql ? null + +# options +, mesaSupported, mesa, mesa_glu +, buildDocs ? false +, buildExamples ? false +, buildTests ? false +, developerBuild ? false +, gtkStyle ? false, libgnomeui, GConf, gnome_vfs, gtk +, decryptSslTraffic ? false +}: + +with stdenv.lib; + +let + inherit (srcs.qt5) version; + system-x86_64 = elem stdenv.system platforms.x86_64; +in + +stdenv.mkDerivation { + + name = "qtbase-${version}"; + inherit version; + + srcs = with srcs; [ qt5.src qtbase.src ]; + + sourceRoot = "qt-everywhere-opensource-src-${version}"; + + postUnpack = '' + mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase + ''; + + prePatch = '' + substituteInPlace configure --replace /bin/pwd pwd + substituteInPlace qtbase/configure --replace /bin/pwd pwd + substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls + substituteInPlace qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ + --replace /usr/share/X11/locale ${libX11}/share/X11/locale \ + --replace /usr/lib/X11/locale ${libX11}/share/X11/locale + sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf + ''; + + patches = + let dlopen-gtkstyle = substituteAll { + src = ./0001-dlopen-gtkstyle.patch; + # substituteAll ignores env vars starting with capital letter + gconf = GConf; + inherit gnome_vfs libgnomeui gtk; + }; + dlopen-resolv = substituteAll { + src = ./0002-dlopen-resolv.patch; + glibc = stdenv.cc.libc; + }; + dlopen-gl = substituteAll { + src = ./0003-dlopen-gl.patch; + openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; + }; + tzdir = ./0004-tzdir.patch; + dlopen-libXcursor = substituteAll { + src = ./0005-dlopen-libXcursor.patch; + inherit libXcursor; + }; + dlopen-openssl = substituteAll { + src = ./0006-dlopen-openssl.patch; + inherit openssl; + }; + dlopen-dbus = substituteAll { + src = ./0007-dlopen-dbus.patch; + dbus_libs = dbus; + }; + xdg-config-dirs = ./0008-xdg-config-dirs.patch; + decrypt-ssl-traffic = ./0009-decrypt-ssl-traffic.patch; + in [ + dlopen-resolv dlopen-gl tzdir dlopen-libXcursor dlopen-openssl + dlopen-dbus xdg-config-dirs + ] + ++ optional gtkStyle dlopen-gtkstyle + ++ optional decryptSslTraffic decrypt-ssl-traffic; + + preConfigure = '' + export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" + export MAKEFLAGS=-j$NIX_BUILD_CORES + + sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5Config.cmake.in" + sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5CoreMacros.cmake" + sed -i 's/NO_DEFAULT_PATH//' "qtbase/src/gui/Qt5GuiConfigExtras.cmake.in" + sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" + + export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml" + export configureFlags+=" -docdir $out/share/doc/qt5" + ''; + + prefixKey = "-prefix "; + + # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa + # TODO Remove obsolete and useless flags once the build will be totally mastered + configureFlags = '' + -verbose + -confirm-license + -opensource + + -release + -shared + -c++11 + ${optionalString developerBuild "-developer-build"} + -largefile + -accessibility + -rpath + -optimized-qmake + -strip + -reduce-relocations + -system-proxies + -pkg-config + + -gui + -widgets + -opengl desktop + -qml-debug + -nis + -iconv + -icu + -pch + -glib + -xcb + -qpa xcb + -${optionalString (cups == null) "no-"}cups + -${optionalString (!gtkStyle) "no-"}gtkstyle + + -no-eglfs + -no-directfb + -no-linuxfb + -no-kms + + ${optionalString (!system-x86_64) "-no-sse2"} + -no-sse3 + -no-ssse3 + -no-sse4.1 + -no-sse4.2 + -no-avx + -no-avx2 + -no-mips_dsp + -no-mips_dspr2 + + -system-zlib + -system-libpng + -system-libjpeg + -system-xcb + -system-xkbcommon + -openssl-linked + -dbus-linked + + -system-sqlite + -${if mysql != null then "plugin" else "no"}-sql-mysql + -${if postgresql != null then "plugin" else "no"}-sql-psql + + -make libs + -make tools + -${optionalString (buildExamples == false) "no"}make examples + -${optionalString (buildTests == false) "no"}make tests + ''; + + # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag + # if dependency paths contain the string "pq", which can occur in the hash. + # To prevent these failures, we need to override PostgreSQL detection. + PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq"; + + propagatedBuildInputs = [ + xlibs.libXcomposite libX11 libxcb libXext libXrender libXi + fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre + zlib libjpeg libpng libtiff sqlite icu + xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon + ] + # Qt doesn't directly need GLU (just GL), but many apps use, it's small and + # doesn't remain a runtime-dep if not used + ++ optionals mesaSupported [ mesa mesa_glu ] + ++ optional (cups != null) cups + ++ optional (mysql != null) mysql.lib + ++ optional (postgresql != null) postgresql + ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; + + buildInputs = + [ bison flex gperf ruby ] + ++ optional developerBuild gdb; + + nativeBuildInputs = [ python perl pkgconfig ]; + + propagatedNativeBuildInputs = [ makeWrapper ]; + + # freetype-2.5.4 changed signedness of some struct fields + NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; + + postInstall = + '' + ${optionalString buildDocs '' + make docs && make install_docs + ''} + + # Don't retain build-time dependencies like gdb and ruby. + sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri + ''; + + inherit lndir; + setupHook = ./setup-hook.sh; + + enableParallelBuilding = true; + + meta = { + homepage = http://qt-project.org; + description = "A cross-platform application framework for C++"; + license = "GPL/LGPL"; + maintainers = with maintainers; [ bbenoist qknight ttuegel ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh new file mode 100644 index 00000000000..d9690559b42 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh @@ -0,0 +1,109 @@ +if [[ -z "$QMAKE" ]]; then + +linkDependencyDir() { + @lndir@/bin/lndir -silent "$1/$2" "$qtOut/$2" + if [[ -n "$NIX_QT_SUBMODULE" ]]; then + find "$1/$2" -printf "$2/%P\n" >> "$out/nix-support/qt-inputs" + fi +} + +addQtModule() { + if [[ -d "$1/mkspecs" ]]; then + # $1 is a Qt module + linkDependencyDir "$1" mkspecs + + for dir in bin include lib share; do + if [[ -d "$1/$dir" ]]; then + linkDependencyDir "$1" "$dir" + fi + done + fi + + if [[ -d "$1/lib/qt5/plugins" ]]; then + addToSearchPath QT_PLUGIN_PATH "$1/lib/qt5/plugins" + fi + + if [[ -d "$1/lib/qt5/imports" ]]; then + addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports" + fi + + if [[ -d "$1/lib/qt5/qml" ]]; then + addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml" + fi + + if [[ -d "$1/share" ]]; then + addToSearchPath XDG_DATA_DIRS "$1/share" + fi +} + +rmQtModules() { + cat "$out/nix-support/qt-inputs" | while read file; do + if [[ -h "$out/$file" ]]; then + rm "$out/$file" + fi + done + + cat "$out/nix-support/qt-inputs" | while read file; do + if [[ -d "$out/$file" ]]; then + rmdir --ignore-fail-on-non-empty -p "$out/$file" + fi + done + + rm "$out/nix-support/qt-inputs" +} + +rmQMake() { + rm "$qtOut/bin/qmake" "$qtOut/bin/qt.conf" +} + +setQMakePath() { + export PATH="$qtOut/bin${PATH:+:}$PATH" +} + +wrapQtProgram() { + wrapProgram "$1" \ + --set QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ + --set QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ + --set QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \ + "$@" +} + +qtOut="" +if [[ -z "$NIX_QT_SUBMODULE" ]]; then + qtOut="$PWD/qmake-$name" +else + qtOut=$out +fi + +mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib" "$qtOut/share" + +cp "@out@/bin/qmake" "$qtOut/bin" +cat >"$qtOut/bin/qt.conf" < +Date: Sun, 23 Aug 2015 09:13:34 -0500 +Subject: [PATCH] glib-2.32 + +--- + src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +index 1f6d25e..087c3fb 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +@@ -81,7 +81,7 @@ + #include + #elif PLATFORM(GTK) + #include +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GCond GCond; + #endif + +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix new file mode 100644 index 00000000000..127766e2ebd --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix @@ -0,0 +1,7 @@ +{ qtSubmodule, qtbase, qttools }: + +qtSubmodule { + name = "qtscript"; + qtInputs = [ qtbase qttools ]; + patches = [ ./0001-glib-2.32.patch ]; +} diff --git a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix b/pkgs/development/libraries/qt-5/5.5/qtsensors.nix new file mode 100644 index 00000000000..61e64dc47e4 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtsensors.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase, qtdeclarative }: + +qtSubmodule { + name = "qtsensors"; + qtInputs = [ qtbase qtdeclarative ]; +} diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch new file mode 100644 index 00000000000..6636cc9265a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch @@ -0,0 +1,28 @@ +From d81c2c870b9bea8fb8e6b85baefb06542f568338 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 23 Aug 2015 09:16:02 -0500 +Subject: [PATCH] dlopen serialport udev + +--- + src/serialport/qtudev_p.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h +index 6f2cabd..81b9849 100644 +--- a/src/serialport/qtudev_p.h ++++ b/src/serialport/qtudev_p.h +@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN + inline bool resolveSymbols(QLibrary *udevLibrary) + { + if (!udevLibrary->isLoaded()) { +- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); ++ udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1); + if (!udevLibrary->load()) { +- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); ++ udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0); + if (!udevLibrary->load()) { + qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); + return false; +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix new file mode 100644 index 00000000000..fa7383fc1e7 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix @@ -0,0 +1,7 @@ +{ qtSubmodule, qtbase }: + +qtSubmodule { + name = "qtserialport"; + qtInputs = [ qtbase ]; + patches = [ ./0001-dlopen-serialport-udev.patch ]; +} diff --git a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix b/pkgs/development/libraries/qt-5/5.5/qtsvg.nix new file mode 100644 index 00000000000..b9ccac7cf93 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtsvg.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase }: + +qtSubmodule { + name = "qtsvg"; + qtInputs = [ qtbase ]; +} diff --git a/pkgs/development/libraries/qt-5/5.5/qttools.nix b/pkgs/development/libraries/qt-5/5.5/qttools.nix new file mode 100644 index 00000000000..65edc450812 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qttools.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase }: + +qtSubmodule { + name = "qttools"; + qtInputs = [ qtbase ]; +} diff --git a/pkgs/development/libraries/qt-5/5.5/qttranslations.nix b/pkgs/development/libraries/qt-5/5.5/qttranslations.nix new file mode 100644 index 00000000000..50fc8cf6826 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qttranslations.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qttools }: + +qtSubmodule { + name = "qttranslations"; + qtInputs = [ qttools ]; +} diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix new file mode 100644 index 00000000000..64f85c42d19 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qttools, qtwebkit }: + +qtSubmodule { + name = "qtwebkit-examples"; + qtInputs = [ qttools qtwebkit ]; +} diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0001-dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0001-dlopen-webkit-nsplugin.patch new file mode 100644 index 00000000000..0eeacce1bc0 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0001-dlopen-webkit-nsplugin.patch @@ -0,0 +1,53 @@ +From 862ce7d357a3ec32683ac6ec7c0ebdc9346b44ba Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 23 Aug 2015 09:18:54 -0500 +Subject: [PATCH 1/3] dlopen webkit nsplugin + +--- + Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +- + Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 +- + Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp +index a923d49..2731d05 100644 +--- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp ++++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp +@@ -136,7 +136,7 @@ static void initializeGtk(QLibrary* module = 0) + } + } + +- QLibrary library(QLatin1String("libgtk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); + if (library.load()) { + typedef void *(*gtk_init_check_ptr)(int*, char***); + gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); +diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp +index de06a2f..363bde5 100644 +--- a/Source/WebCore/plugins/qt/PluginViewQt.cpp ++++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp +@@ -697,7 +697,7 @@ static Display *getPluginDisplay() + // support gdk based plugins (like flash) that use a different X connection. + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); +- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); + if (!library.load()) + return 0; + +diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +index d734ff6..62a2197 100644 +--- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp ++++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +@@ -64,7 +64,7 @@ static Display* getPluginDisplay() + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); + +- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0); + if (!library.load()) + return 0; + +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0002-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0002-dlopen-webkit-gtk.patch new file mode 100644 index 00000000000..bb5d1f74364 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0002-dlopen-webkit-gtk.patch @@ -0,0 +1,25 @@ +From 6a407d30357c2551abceac75c82f4a1688e47437 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 23 Aug 2015 09:19:16 -0500 +Subject: [PATCH 2/3] dlopen webkit gtk + +--- + Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +index 8de6521..0b25748 100644 +--- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp ++++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +@@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr + + static bool initializeGtk() + { +- QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0); ++ QLibrary gtkLibrary(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); + if (!gtkLibrary.load()) + return false; + typedef void* (*gtk_init_ptr)(void*, void*); +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch new file mode 100644 index 00000000000..f3b9d407bd7 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch @@ -0,0 +1,31 @@ +From 864020dd47c3b6d532d9f26b82185904cf9324f2 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 23 Aug 2015 09:19:29 -0500 +Subject: [PATCH 3/3] dlopen webkit udev + +--- + Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Source/WebCore/platform/qt/GamepadsQt.cpp b/Source/WebCore/platform/qt/GamepadsQt.cpp +index 60ff317..da8ac69 100644 +--- a/Source/WebCore/platform/qt/GamepadsQt.cpp ++++ b/Source/WebCore/platform/qt/GamepadsQt.cpp +@@ -111,12 +111,12 @@ private: + bool load() + { + m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint); +- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1); ++ m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1); + m_loaded = m_libUdev.load(); + if (resolveMethods()) + return true; + +- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0); ++ m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0); + m_loaded = m_libUdev.load(); + return resolveMethods(); + } +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix new file mode 100644 index 00000000000..596c02d39af --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix @@ -0,0 +1,33 @@ +{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtmultimedia, qtsensors +, fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt +, sqlite, udev +, bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby +, substituteAll +, flashplayerFix ? false +}: + +with stdenv.lib; + +qtSubmodule { + name = "qtwebkit"; + qtInputs = [ qtdeclarative qtlocation qtmultimedia qtsensors ]; + buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite ]; + nativeBuildInputs = [ + bison2 flex gdb gperf perl pkgconfig python ruby + ]; + patches = + let dlopen-webkit-nsplugin = substituteAll { + src = ./0001-dlopen-webkit-nsplugin.patch; + inherit gtk gdk_pixbuf; + }; + dlopen-webkit-gtk = substituteAll { + src = ./0002-dlopen-webkit-gtk.patch; + inherit gtk; + }; + dlopen-webkit-udev = substituteAll { + src = ./0003-dlopen-webkit-udev.patch; + inherit udev; + }; + in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ] + ++ [ dlopen-webkit-udev ]; +} diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix new file mode 100644 index 00000000000..fbdfbbcf0db --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase, qtdeclarative }: + +qtSubmodule { + name = "qtwebsockets"; + qtInputs = [ qtbase qtdeclarative ]; +} diff --git a/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix new file mode 100644 index 00000000000..a765161e2d7 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase }: + +qtSubmodule { + name = "qtx11extras"; + qtInputs = [ qtbase ]; +} diff --git a/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix new file mode 100644 index 00000000000..9a8ddbba2bd --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase }: + +qtSubmodule { + name = "qtxmlpatterns"; + qtInputs = [ qtbase ]; +} diff --git a/pkgs/development/libraries/qt-5/5.5/srcs.nix b/pkgs/development/libraries/qt-5/5.5/srcs.nix new file mode 100644 index 00000000000..f1b148629d3 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/srcs.nix @@ -0,0 +1,261 @@ +# DO NOT EDIT! This file is generated automatically by manifest.sh +{ fetchurl, mirror }: + +{ + qtbase = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtbase-opensource-src-5.5.0.tar.xz"; + sha256 = "0r89axg4vnli0i5s9zxwpcpsdiz12kyx7y2vz0zx204wff8hcgw9"; + name = "qtbase-opensource-src-5.5.0.tar.xz"; + }; + }; + qtsensors = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtsensors-opensource-src-5.5.0.tar.xz"; + sha256 = "0jyiby8q3gyly5sxli4bncs69k1fk0vq9cpkfb4dla2bz6frhnld"; + name = "qtsensors-opensource-src-5.5.0.tar.xz"; + }; + }; + qtwinextras = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtwinextras-opensource-src-5.5.0.tar.xz"; + sha256 = "17kf8hcgr98agr4c5dy3xaifbwzk06ys0qcc6r8s4a40lxpf5vxm"; + name = "qtwinextras-opensource-src-5.5.0.tar.xz"; + }; + }; + qtxmlpatterns = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtxmlpatterns-opensource-src-5.5.0.tar.xz"; + sha256 = "0lzg1j7766bfvhdjd7cp0r6lff7xpzd3q5wrq6p5qg61f3384a37"; + name = "qtxmlpatterns-opensource-src-5.5.0.tar.xz"; + }; + }; + qtwayland = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtwayland-opensource-src-5.5.0.tar.xz"; + sha256 = "0sf8s6vficn7njmrlqcwad1hd3gfhzz84r75h9c53lyys7zkyypa"; + name = "qtwayland-opensource-src-5.5.0.tar.xz"; + }; + }; + qtwebchannel = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtwebchannel-opensource-src-5.5.0.tar.xz"; + sha256 = "139dxdm5kqdf0nbqchvcm70gb6nf9cfn04qv387s6a8bzw28dy4l"; + name = "qtwebchannel-opensource-src-5.5.0.tar.xz"; + }; + }; + qtwebsockets = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtwebsockets-opensource-src-5.5.0.tar.xz"; + sha256 = "1s4axvvqs1ajmb62hg4hyq4c9cckkpvgjfj0vkdxvrninaqnbm0s"; + name = "qtwebsockets-opensource-src-5.5.0.tar.xz"; + }; + }; + qtdeclarative = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtdeclarative-opensource-src-5.5.0.tar.xz"; + sha256 = "0wv7dzlll1k8070kkdriz668hxxg8ka4xv7dh67xlr3pck2i52l5"; + name = "qtdeclarative-opensource-src-5.5.0.tar.xz"; + }; + }; + qtcanvas3d = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtcanvas3d-opensource-src-5.5.0.tar.xz"; + sha256 = "1is5yikkmps0l03i75r3djgr93nmlbhs6nhawvd4mxrvkwscggj6"; + name = "qtcanvas3d-opensource-src-5.5.0.tar.xz"; + }; + }; + qttools = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qttools-opensource-src-5.5.0.tar.xz"; + sha256 = "0zf0z8r83255m5qximipywldf29p17qn7whfq9b48zzvhxqi8rav"; + name = "qttools-opensource-src-5.5.0.tar.xz"; + }; + }; + qtsvg = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtsvg-opensource-src-5.5.0.tar.xz"; + sha256 = "17z149inv8b83530s0vaas8rj5q7sv011i8pvznsnkfkcvndxvq0"; + name = "qtsvg-opensource-src-5.5.0.tar.xz"; + }; + }; + qt5 = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qt5-opensource-src-5.5.0.tar.xz"; + sha256 = "1rbjrg73lr3782nic5rjpmkx9wacnbw7ql7wxwmsz9fpmpafs267"; + name = "qt5-opensource-src-5.5.0.tar.xz"; + }; + }; + qtscript = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtscript-opensource-src-5.5.0.tar.xz"; + sha256 = "12vyhs6y7c869gg0hmh56hjz5wkmg5dbb7dlv71idjrfigm34f9l"; + name = "qtscript-opensource-src-5.5.0.tar.xz"; + }; + }; + qt3d = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qt3d-opensource-src-5.5.0.tar.xz"; + sha256 = "13jnqg4asik3jkw5csm0p9rl5b31ism7yzyndyyyjygjnvxm8v5z"; + name = "qt3d-opensource-src-5.5.0.tar.xz"; + }; + }; + qtgraphicaleffects = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtgraphicaleffects-opensource-src-5.5.0.tar.xz"; + sha256 = "1vj7l7qfqprmdd5ay9p32dfy3cqxbrilhqza9wk7yy8lfi752hzi"; + name = "qtgraphicaleffects-opensource-src-5.5.0.tar.xz"; + }; + }; + qtmacextras = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtmacextras-opensource-src-5.5.0.tar.xz"; + sha256 = "1r4pjcw07j4n110vf3amwbj1x31ncl3h9c5kfampn4fb3b0vjx6j"; + name = "qtmacextras-opensource-src-5.5.0.tar.xz"; + }; + }; + qtx11extras = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtx11extras-opensource-src-5.5.0.tar.xz"; + sha256 = "0ydrs0vdcapbdf2d8sj6pvxj11p0id684c6ywbq53dghr72wxcxw"; + name = "qtx11extras-opensource-src-5.5.0.tar.xz"; + }; + }; + qttranslations = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qttranslations-opensource-src-5.5.0.tar.xz"; + sha256 = "11mzc3403r81krldlmnr9ap07lgqnz67bmvblp6gxjq1w4q1gkjs"; + name = "qttranslations-opensource-src-5.5.0.tar.xz"; + }; + }; + qtquickcontrols = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtquickcontrols-opensource-src-5.5.0.tar.xz"; + sha256 = "1sn2g3sazd3l3zi8m8a9qdakm9fic44m259iyf97yychnfk6lqfz"; + name = "qtquickcontrols-opensource-src-5.5.0.tar.xz"; + }; + }; + qtwebkit = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtwebkit-opensource-src-5.5.0.tar.xz"; + sha256 = "1v7fv4188rppd1l1nmhdkhlg2x1q9d5shy63n1l0l13x6jb4k5hp"; + name = "qtwebkit-opensource-src-5.5.0.tar.xz"; + }; + }; + qtserialport = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtserialport-opensource-src-5.5.0.tar.xz"; + sha256 = "0rm8xwq7fr6q9gwhqqp3b4y9n7mqhcgr40f9f5dqkhy12chjs3m6"; + name = "qtserialport-opensource-src-5.5.0.tar.xz"; + }; + }; + qtmultimedia = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtmultimedia-opensource-src-5.5.0.tar.xz"; + sha256 = "0nrmhmgwxc1flzg9qnjzpa6qq06gl7x8cskfj2ibnx5dkgaipgx8"; + name = "qtmultimedia-opensource-src-5.5.0.tar.xz"; + }; + }; + qtwebkit-examples = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtwebkit-examples-opensource-src-5.5.0.tar.xz"; + sha256 = "04mxshf730jkmp3cma65vb0m43y8y9y7l31rhbbnmq78avxn8mfj"; + name = "qtwebkit-examples-opensource-src-5.5.0.tar.xz"; + }; + }; + qtquick1 = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtquick1-opensource-src-5.5.0.tar.xz"; + sha256 = "0b7s1pdlbf1a7mz3pkdg7y81nl5s5670lg6majich2v7w4rknmnv"; + name = "qtquick1-opensource-src-5.5.0.tar.xz"; + }; + }; + qtwebengine = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtwebengine-opensource-src-5.5.0.tar.xz"; + sha256 = "0nnnrcrj0d0ksynsl60zv0z1vq7j123xv6s1lgwq6hkl704fc0yp"; + name = "qtwebengine-opensource-src-5.5.0.tar.xz"; + }; + }; + qtactiveqt = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtactiveqt-opensource-src-5.5.0.tar.xz"; + sha256 = "17nh4gi562cs8rpypvnzld87g407qhxi9gpdcvkjzm4mbhqwa9ql"; + name = "qtactiveqt-opensource-src-5.5.0.tar.xz"; + }; + }; + qtimageformats = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtimageformats-opensource-src-5.5.0.tar.xz"; + sha256 = "0mc9mxrggnhvvgkl7gf8sp6cn9g5ffhi77krcraxhzavmk9d2yb4"; + name = "qtimageformats-opensource-src-5.5.0.tar.xz"; + }; + }; + qtlocation = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtlocation-opensource-src-5.5.0.tar.xz"; + sha256 = "036bxsjscvwnpy72cvlzv8dday9r76mvpbj9r8fhwhgxakspyb8a"; + name = "qtlocation-opensource-src-5.5.0.tar.xz"; + }; + }; + qtandroidextras = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtandroidextras-opensource-src-5.5.0.tar.xz"; + sha256 = "1dnmacpvxrz11nc4hm702p88f1hy5prabvdjx1zwrf55724lc8q2"; + name = "qtandroidextras-opensource-src-5.5.0.tar.xz"; + }; + }; + qtenginio = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtenginio-opensource-src-5.5.0.tar.xz"; + sha256 = "080m3zr5av5bc2gxqyb648hy07jj3rdybkfgh5gcn2sm4qm4n77n"; + name = "qtenginio-opensource-src-5.5.0.tar.xz"; + }; + }; + qtconnectivity = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtconnectivity-opensource-src-5.5.0.tar.xz"; + sha256 = "00j3abhvq9bg4v5z25b7jsr5c2w7hdmnljn875013p0i9s9xvkzi"; + name = "qtconnectivity-opensource-src-5.5.0.tar.xz"; + }; + }; + qtdoc = { + version = "5.5.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.0/submodules/qtdoc-opensource-src-5.5.0.tar.xz"; + sha256 = "19vgx1h45g7plj23sckd52npsl8i14fknl5gg103p9xpbq8lw5vz"; + name = "qtdoc-opensource-src-5.5.0.tar.xz"; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbf7baf2127..0b071c9e4f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7899,6 +7899,8 @@ let }); qt54 = recurseIntoAttrs (callPackage ../development/libraries/qt-5/5.4 {}); + qt55 = recurseIntoAttrs (import ../development/libraries/qt-5/5.5 { inherit pkgs; }); + qt5 = qt54; From 0c9460db0816e219fff0e3f918823a647d3e0537 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 09:50:10 -0500 Subject: [PATCH 04/43] add qt5LibsFun --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b071c9e4f4..d5e23011901 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7901,9 +7901,13 @@ let qt54 = recurseIntoAttrs (callPackage ../development/libraries/qt-5/5.4 {}); qt55 = recurseIntoAttrs (import ../development/libraries/qt-5/5.5 { inherit pkgs; }); - qt5 = qt54; + qt5LibsFun = self: with self; { + }; + + qt55Libs = lib.makeScope qt55.newScope qt5LibsFun; + qtEnv = callPackage ../development/libraries/qt-5/qt-env.nix {}; qt5Full = appendToName "full" (qtEnv { From 52798834a8667733c4d41279158093ac3bb05cc9 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 09:54:15 -0500 Subject: [PATCH 05/43] phonon: build with Qt 5.5 --- .../phonon-backend-gstreamer/qt5/default.nix | 4 +-- .../phonon-backend-gstreamer/qt5/old.nix | 34 ++++++++++++++++++ .../phonon-backend-vlc/qt5/default.nix | 10 ++---- .../libraries/phonon/qt5/default.nix | 6 ++-- pkgs/development/libraries/phonon/qt5/old.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 13 ++++--- 6 files changed, 87 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix create mode 100644 pkgs/development/libraries/phonon/qt5/old.nix diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix index bc34d249b46..2c6e40eaf73 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, gst_all_1, phonon_qt5, pkgconfig, qt5, debug ? false }: +{ stdenv, fetchurl, cmake, gst_all_1, phonon, pkgconfig, qtbase, debug ? false }: with stdenv.lib; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10"; }; - buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon_qt5 qt5.base ]; + buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon qtbase ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix new file mode 100644 index 00000000000..bc34d249b46 --- /dev/null +++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, cmake, gst_all_1, phonon_qt5, pkgconfig, qt5, debug ? false }: + +with stdenv.lib; + +let + version = "4.8.2"; + pname = "phonon-backend-gstreamer"; +in + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10"; + }; + + buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon_qt5 qt5.base ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DPHONON_BUILD_PHONON4QT5=ON" + ] + ++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; + + meta = with stdenv.lib; { + homepage = http://phonon.kde.org/; + description = "GStreamer backend for Phonon"; + platforms = platforms.linux; + maintainer = with maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix b/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix index b7e4dc7c2b0..744d681a694 100644 --- a/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix +++ b/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix @@ -1,16 +1,10 @@ -{ stdenv, fetchurl, xz, vlc, cmake, pkgconfig, phonon_qt5, qt5 }: +{ stdenv, fetchurl, xz, vlc, cmake, pkgconfig, phonon, qtbase }: with stdenv.lib; let pname = "phonon-backend-vlc"; v = "0.8.2"; - # Force same Qt version in phonon and VLC - vlc_ = vlc.override { - inherit qt5; - qt4 = null; - withQt5 = true; - }; in stdenv.mkDerivation { @@ -23,7 +17,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig xz ]; - buildInputs = [ vlc_ phonon_qt5 qt5.base ]; + buildInputs = [ vlc phonon qtbase ]; cmakeFlags = ["-DPHONON_BUILD_PHONON4QT5=ON"]; diff --git a/pkgs/development/libraries/phonon/qt5/default.nix b/pkgs/development/libraries/phonon/qt5/default.nix index 3dddd60b59f..fc07344d2d1 100644 --- a/pkgs/development/libraries/phonon/qt5/default.nix +++ b/pkgs/development/libraries/phonon/qt5/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio, qt5, debug ? false }: +{ stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio +, qtbase, qtquick1, qttools +, debug ? false }: with stdenv.lib; @@ -14,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551"; }; - buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools libpulseaudio ]; + buildInputs = [ mesa qtbase qtquick1 qttools libpulseaudio ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/phonon/qt5/old.nix b/pkgs/development/libraries/phonon/qt5/old.nix new file mode 100644 index 00000000000..3dddd60b59f --- /dev/null +++ b/pkgs/development/libraries/phonon/qt5/old.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio, qt5, debug ? false }: + +with stdenv.lib; + +let + v = "4.8.3"; +in + +stdenv.mkDerivation rec { + name = "phonon-${v}"; + + src = fetchurl { + url = "mirror://kde/stable/phonon/${v}/src/phonon-${v}.tar.xz"; + sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551"; + }; + + buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools libpulseaudio ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + + NIX_CFLAGS_COMPILE = "-fPIC"; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" + "-DPHONON_BUILD_PHONON4QT5=ON" + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; + + meta = { + homepage = http://phonon.kde.org/; + description = "Multimedia API for Qt"; + license = stdenv.lib.licenses.lgpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5e23011901..8cbc40c7ecd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7775,11 +7775,9 @@ let phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt4 {}; - phonon_qt5 = callPackage ../development/libraries/phonon/qt5 { }; + phonon_qt5 = callPackage ../development/libraries/phonon/qt5/old.nix {}; - phonon_qt5_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { }; - - phonon_qt5_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { }; + phonon_backend_gstreamer_qt5 = callPackage ../development/libraries/phonon-backend-gstreamer/qt5/old.nix {}; physfs = callPackage ../development/libraries/physfs { }; @@ -7904,6 +7902,13 @@ let qt5 = qt54; qt5LibsFun = self: with self; { + + phonon = callPackage ../development/libraries/phonon/qt5 { }; + + phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { }; + + phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { }; + }; qt55Libs = lib.makeScope qt55.newScope qt5LibsFun; From e2c25b2f6068c85d259557553de6ba4fbaa045ae Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 09:58:27 -0500 Subject: [PATCH 06/43] polkitQt: build with Qt 5.5 --- .../libraries/polkit-qt-1/default.nix | 11 ++++++---- .../development/libraries/polkit-qt-1/old.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 ++++--- 3 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/libraries/polkit-qt-1/old.nix diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix index b887134e5b9..3715158705c 100644 --- a/pkgs/development/libraries/polkit-qt-1/default.nix +++ b/pkgs/development/libraries/polkit-qt-1/default.nix @@ -1,7 +1,10 @@ { stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib -, qt4 ? null, qt5 ? null, withQt5 ? false }: +, qt4 ? null +, withQt5 ? false, qtbase ? null }: -assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null); +with stdenv.lib; + +assert (withQt5 -> qtbase != null); assert (!withQt5 -> qt4 != null); stdenv.mkDerivation { name = "polkit-qt-1-0.112.0"; @@ -11,9 +14,9 @@ stdenv.mkDerivation { sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7"; }; - nativeBuildInputs = [ cmake automoc4 pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ] ++ optional (!withQt5) automoc4; - propagatedBuildInputs = [ polkit glib ] ++ (if withQt5 then [qt5.base] else [qt4]); + propagatedBuildInputs = [ polkit glib ] ++ [(if withQt5 then qtbase else qt4)]; meta = { description = "A Qt wrapper around PolKit"; diff --git a/pkgs/development/libraries/polkit-qt-1/old.nix b/pkgs/development/libraries/polkit-qt-1/old.nix new file mode 100644 index 00000000000..b887134e5b9 --- /dev/null +++ b/pkgs/development/libraries/polkit-qt-1/old.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib +, qt4 ? null, qt5 ? null, withQt5 ? false }: + +assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null); + +stdenv.mkDerivation { + name = "polkit-qt-1-0.112.0"; + + src = fetchurl { + url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2"; + sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7"; + }; + + nativeBuildInputs = [ cmake automoc4 pkgconfig ]; + + propagatedBuildInputs = [ polkit glib ] ++ (if withQt5 then [qt5.base] else [qt4]); + + meta = { + description = "A Qt wrapper around PolKit"; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cbc40c7ecd..be9996e1d39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7803,9 +7803,7 @@ let polkit_qt4 = callPackage ../development/libraries/polkit-qt-1 { }; - polkit_qt5 = callPackage ../development/libraries/polkit-qt-1 { - withQt5 = true; - }; + polkit_qt5 = callPackage ../development/libraries/polkit-qt-1/old.nix { withQt5 = true; }; policykit = callPackage ../development/libraries/policykit { }; @@ -7909,6 +7907,10 @@ let phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { }; + polkitQt = callPackage ../development/libraries/polkit-qt-1 { + withQt5 = true; + }; + }; qt55Libs = lib.makeScope qt55.newScope qt5LibsFun; From 60000c87ae61b8c100963bbf90d5cf3cae1e770c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 09:59:32 -0500 Subject: [PATCH 07/43] popplerQt: build with Qt 5.5 --- pkgs/development/libraries/poppler/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 9c22430a711..b15142dc673 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg -, minimal ? false, qt4Support ? false, qt4 ? null, qt5Support ? false, qt5 ? null +, minimal ? false, qt4Support ? false, qt4 ? null, qt5Support ? false, qtbase ? null , utils ? false, suffix ? "glib" }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { [ zlib freetype fontconfig libjpeg lcms curl openjpeg ] ++ optional (!minimal) cairo ++ optional qt4Support qt4 - ++ optional qt5Support qt5.base; + ++ optional qt5Support qtbase; nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be9996e1d39..a73bda023df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7819,10 +7819,7 @@ let suffix = "qt4"; }; - poppler_qt5 = poppler.override { - qt5Support = true; - suffix = "qt5"; - }; + poppler_qt5 = qt5Libs.popplerQt; poppler_utils = poppler.override { suffix = "utils"; utils = true; }; @@ -7911,6 +7908,12 @@ let withQt5 = true; }; + popplerQt = callPackage ../development/libraries/poppler { + lcms = lcms2; + qt5Support = true; + suffix = "qt5"; + }; + }; qt55Libs = lib.makeScope qt55.newScope qt5LibsFun; From 943c2bf0590fac691469cb915cf7f970bf8c55fd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:00:13 -0500 Subject: [PATCH 08/43] qca-qt5: build with Qt 5.5 --- .../development/libraries/qca-qt5/default.nix | 4 +-- pkgs/development/libraries/qca-qt5/old.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 3 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/qca-qt5/old.nix diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index d0bcb73151f..cabe672d7bc 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, openssl, pkgconfig, qt5 }: +{ stdenv, fetchgit, cmake, openssl, pkgconfig, qtbase }: let rev = "088ff642fc2990871e3555e73c94c9287e7514a9"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "fe1c7d5d6f38445a4032548ae3ea22c74d4327dfaf2dc88492a95facbca398f8"; }; - buildInputs = [ openssl qt5.base ]; + buildInputs = [ openssl qtbase ]; nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/qca-qt5/old.nix b/pkgs/development/libraries/qca-qt5/old.nix new file mode 100644 index 00000000000..d0bcb73151f --- /dev/null +++ b/pkgs/development/libraries/qca-qt5/old.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, cmake, openssl, pkgconfig, qt5 }: + +let + rev = "088ff642fc2990871e3555e73c94c9287e7514a9"; + shortrev = builtins.substring 0 7 rev; +in +stdenv.mkDerivation rec { + name = "qca-qt5-20150422-${shortrev}"; + src = fetchgit { + url = "git://anongit.kde.org/qca.git"; + branchName = "qt5"; + inherit rev; + sha256 = "fe1c7d5d6f38445a4032548ae3ea22c74d4327dfaf2dc88492a95facbca398f8"; + }; + + buildInputs = [ openssl qt5.base ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + meta = with stdenv.lib; { + description = "Qt 5 Cryptographic Architecture"; + homepage = http://delta.affinix.com/qca; + maintainers = with maintainers; [ ttuegel ]; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a73bda023df..eb66abbcadd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7856,7 +7856,7 @@ let qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; - qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + qca-qt5 = callPackage ../development/libraries/qca-qt5/old.nix { }; qimageblitz = callPackage ../development/libraries/qimageblitz {}; @@ -7914,6 +7914,8 @@ let suffix = "qt5"; }; + qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + }; qt55Libs = lib.makeScope qt55.newScope qt5LibsFun; From c9a6d288b5bd0785b3263adfdd94c7c4396192f7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:01:11 -0500 Subject: [PATCH 09/43] vlc_qt5: build with Qt 5.5 --- pkgs/applications/video/vlc/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 9 ++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 732d8cd8a0a..e5db4c0b2db 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -8,13 +8,14 @@ , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libvdpau, libsamplerate , onlyLibVLC ? false -, qt4 ? null, qt5 ? null, withQt5 ? false +, qt4 ? null +, withQt5 ? false, qtbase ? null , jackSupport ? false }: with stdenv.lib; -assert (withQt5 -> qt5 != null); +assert (withQt5 -> qtbase != null); assert (!withQt5 -> qt4 != null); stdenv.mkDerivation rec { @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate ] - ++ (if withQt5 then with qt5; [ base ] else [qt4]) + ++ [(if withQt5 then qtbase else qt4)] ++ optional jackSupport libjack2; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb66abbcadd..aab4f19ff76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7916,6 +7916,11 @@ let qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + vlc = callPackage ../applications/video/vlc { + qt4 = null; + withQt5 = true; + }; + }; qt55Libs = lib.makeScope qt55.newScope qt5LibsFun; @@ -13051,9 +13056,7 @@ let ffmpeg = ffmpeg_2; }; - vlc_qt5 = vlc.override { - withQt5 = true; - }; + vlc_qt5 = qt5Libs.vlc; vmpk = callPackage ../applications/audio/vmpk { }; From 32a5695f2cf02f4b561bf80e1d6210b241df5f9c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:02:10 -0500 Subject: [PATCH 10/43] kf513: init at 5.13.0 --- .../libraries/kde-frameworks-5.13/attica.nix | 11 + .../libraries/kde-frameworks-5.13/baloo.nix | 49 ++ .../kde-frameworks-5.13/bluez-qt.nix | 17 + .../libraries/kde-frameworks-5.13/default.nix | 113 ++++ .../0001-extra-cmake-modules-paths.patch | 74 +++ .../extra-cmake-modules/default.nix | 17 + .../extra-cmake-modules/setup-hook.sh | 4 + .../kde-frameworks-5.13/fetchsrcs.sh | 47 ++ .../frameworkintegration.nix | 34 ++ .../kde-frameworks-5.13/kactivities.nix | 42 ++ .../libraries/kde-frameworks-5.13/kapidox.nix | 12 + .../kde-frameworks-5.13/karchive.nix | 11 + .../kde-frameworks-5.13/kauth/default.nix | 16 + .../kauth/kauth-policy-install.patch | 13 + .../kde-frameworks-5.13/kbookmarks.nix | 25 + .../kde-frameworks-5.13/kcmutils/default.nix | 31 + ...utils-pluginselector-follow-symlinks.patch | 13 + .../libraries/kde-frameworks-5.13/kcodecs.nix | 11 + .../kde-frameworks-5.13/kcompletion.nix | 14 + .../libraries/kde-frameworks-5.13/kconfig.nix | 15 + .../kconfigwidgets/default.nix | 24 + ...igwidgets-helpclient-follow-symlinks.patch | 13 + .../kde-frameworks-5.13/kcoreaddons.nix | 13 + .../libraries/kde-frameworks-5.13/kcrash.nix | 15 + .../kde-frameworks-5.13/kdbusaddons.nix | 16 + .../kde-frameworks-5.13/kdeclarative.nix | 30 + .../libraries/kde-frameworks-5.13/kded.nix | 19 + .../kde-frameworks-5.13/kdelibs4support.nix | 58 ++ .../kde-frameworks-5.13/kdesignerplugin.nix | 30 + .../libraries/kde-frameworks-5.13/kdesu.nix | 17 + .../kde-frameworks-5.13/kdewebkit.nix | 22 + .../libraries/kde-frameworks-5.13/kdnssd.nix | 13 + .../kde-frameworks-5.13/kdoctools/default.nix | 24 + .../kdoctools-no-find-docbook-xml.patch | 12 + .../kde-frameworks-5.13/kemoticons.nix | 17 + .../kde-frameworks-5.13/kfilemetadata.nix | 22 + .../kde-frameworks-5.13/kglobalaccel.nix | 21 + .../kde-frameworks-5.13/kguiaddons.nix | 13 + .../libraries/kde-frameworks-5.13/khtml.nix | 35 ++ .../libraries/kde-frameworks-5.13/ki18n.nix | 16 + .../kde-frameworks-5.13/kiconthemes.nix | 16 + .../kde-frameworks-5.13/kidletime.nix | 15 + .../kde-frameworks-5.13/kimageformats.nix | 13 + .../kinit/0001-kinit-libpath.patch | 42 ++ .../kde-frameworks-5.13/kinit/default.nix | 24 + .../libraries/kde-frameworks-5.13/kio.nix | 48 ++ .../kde-frameworks-5.13/kitemmodels.nix | 11 + .../kde-frameworks-5.13/kitemviews.nix | 11 + .../kde-frameworks-5.13/kjobwidgets.nix | 15 + .../libraries/kde-frameworks-5.13/kjs.nix | 15 + .../kde-frameworks-5.13/kjsembed.nix | 21 + .../kde-frameworks-5.13/kmediaplayer.nix | 15 + .../kde-frameworks-5.13/knewstuff.nix | 29 + .../kde-frameworks-5.13/knotifications.nix | 21 + .../kde-frameworks-5.13/knotifyconfig.nix | 17 + .../kpackage/0001-allow-external-paths.patch | 25 + .../kde-frameworks-5.13/kpackage/default.nix | 22 + .../libraries/kde-frameworks-5.13/kparts.nix | 27 + .../libraries/kde-frameworks-5.13/kpeople.nix | 20 + .../kde-frameworks-5.13/kplotting.nix | 11 + .../libraries/kde-frameworks-5.13/kpty.nix | 15 + .../libraries/kde-frameworks-5.13/kross.nix | 23 + .../libraries/kde-frameworks-5.13/krunner.nix | 24 + .../kde-frameworks-5.13/kservice/default.nix | 25 + ...service-kbuildsycoca-follow-symlinks.patch | 13 + ...ce-kbuildsycoca-no-canonicalize-path.patch | 13 + .../kservice/setup-hook.sh | 13 + .../0001-no-qcoreapplication.patch | 48 ++ .../ktexteditor/default.nix | 27 + .../kde-frameworks-5.13/ktextwidgets.nix | 23 + .../kde-frameworks-5.13/kunitconversion.nix | 13 + .../libraries/kde-frameworks-5.13/kwallet.nix | 30 + .../kde-frameworks-5.13/kwidgetsaddons.nix | 11 + .../kde-frameworks-5.13/kwindowsystem.nix | 13 + .../libraries/kde-frameworks-5.13/kxmlgui.nix | 25 + .../kde-frameworks-5.13/kxmlrpcclient.nix | 15 + .../kde-frameworks-5.13/modemmanager-qt.nix | 13 + .../kde-frameworks-5.13/networkmanager-qt.nix | 13 + .../plasma-framework/default.nix | 40 ++ .../libraries/kde-frameworks-5.13/solid.nix | 14 + .../libraries/kde-frameworks-5.13/sonnet.nix | 13 + .../libraries/kde-frameworks-5.13/srcs.nix | 549 ++++++++++++++++++ .../kde-frameworks-5.13/threadweaver.nix | 11 + pkgs/top-level/all-packages.nix | 1 + 84 files changed, 2402 insertions(+) create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/attica.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/baloo.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/bluez-qt.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/0001-extra-cmake-modules-paths.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/setup-hook.sh create mode 100755 pkgs/development/libraries/kde-frameworks-5.13/fetchsrcs.sh create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/frameworkintegration.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kactivities.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kapidox.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/karchive.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kauth/kauth-policy-install.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kbookmarks.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kcmutils/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kcmutils/kcmutils-pluginselector-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kcodecs.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kcoreaddons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kdbusaddons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kdeclarative.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kded.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kdelibs4support.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kdesignerplugin.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kdesu.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kdewebkit.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kdnssd.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kdoctools/kdoctools-no-find-docbook-xml.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kemoticons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kfilemetadata.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kguiaddons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/khtml.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kiconthemes.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kinit/0001-kinit-libpath.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kio.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kitemmodels.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kjs.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kjsembed.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kmediaplayer.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/knewstuff.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/knotifications.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/knotifyconfig.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kpackage/0001-allow-external-paths.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kpackage/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kparts.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kpeople.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kplotting.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kpty.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kross.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/krunner.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kservice/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kservice/setup-hook.sh create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/0001-no-qcoreapplication.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/ktextwidgets.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kunitconversion.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kwallet.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kwidgetsaddons.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kxmlgui.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/kxmlrpcclient.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/modemmanager-qt.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/plasma-framework/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/solid.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/sonnet.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/srcs.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.13/attica.nix b/pkgs/development/libraries/kde-frameworks-5.13/attica.nix new file mode 100644 index 00000000000..067a9b0a8f2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/attica.nix @@ -0,0 +1,11 @@ +{ mkDerivation, lib +, extra-cmake-modules +}: + +mkDerivation { + name = "attica"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.13/baloo.nix new file mode 100644 index 00000000000..8c82002348f --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/baloo.nix @@ -0,0 +1,49 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kauth +, kconfig +, kcoreaddons +, kcrash +, kdbusaddons +, kfilemetadata +, ki18n +, kidletime +, kio +, lmdb +, qtbase +, qtquick1 +, solid +}: + +mkDerivation { + name = "baloo"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kauth + kconfig + kcrash + kdbusaddons + ki18n + kidletime + kio + lmdb + qtquick1 + solid + ]; + propagatedBuildInputs = [ + kcoreaddons + kfilemetadata + qtbase + ]; + postInstall = '' + wrapKDEProgram "$out/bin/baloo_file" + wrapKDEProgram "$out/bin/baloo_file_extractor" + wrapKDEProgram "$out/bin/balooctl" + wrapKDEProgram "$out/bin/baloosearch" + wrapKDEProgram "$out/bin/balooshow" + wrapKDEProgram "$out/bin/baloo-monitor" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.13/bluez-qt.nix new file mode 100644 index 00000000000..978b6af4126 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/bluez-qt.nix @@ -0,0 +1,17 @@ +{ mkDerivation, lib +, extra-cmake-modules +, qtdeclarative +}: + +mkDerivation { + name = "bluez-qt"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtdeclarative ]; + preConfigure = '' + substituteInPlace CMakeLists.txt \ + --replace /lib/udev/rules.d "$out/lib/udev/rules.d" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/default.nix new file mode 100644 index 00000000000..e35aac08a28 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/default.nix @@ -0,0 +1,113 @@ +# Maintainer's Notes: +# +# How To Update +# 1. Edit the URL in ./manifest.sh +# 2. Run ./manifest.sh +# 3. Fix build errors. + +{ pkgs, debug ? false }: + +let + + inherit (pkgs) lib; + + mirror = "mirror://kde"; + srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; + + mkDerivation = args: + let + inherit (args) name; + inherit (srcs."${name}") src version; + inherit (pkgs.stdenv) mkDerivation; + in mkDerivation (args // { + name = "${name}-${version}"; + inherit src; + + cmakeFlags = + (args.cmakeFlags or []) + ++ [ "-DBUILD_TESTING=OFF" ] + ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; + + meta = { + license = with lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; + } // (args.meta or {}); + }); + + addPackages = self: with self; { + attica = callPackage ./attica.nix {}; + baloo = callPackage ./baloo.nix {}; + bluez-qt = callPackage ./bluez-qt.nix {}; + extra-cmake-modules = callPackage ./extra-cmake-modules {}; + frameworkintegration = callPackage ./frameworkintegration.nix {}; + kactivities = callPackage ./kactivities.nix {}; + kapidox = callPackage ./kapidox.nix {}; + karchive = callPackage ./karchive.nix {}; + kauth = callPackage ./kauth {}; + kbookmarks = callPackage ./kbookmarks.nix {}; + kcmutils = callPackage ./kcmutils {}; + kcodecs = callPackage ./kcodecs.nix {}; + kcompletion = callPackage ./kcompletion.nix {}; + kconfig = callPackage ./kconfig.nix {}; + kconfigwidgets = callPackage ./kconfigwidgets {}; + kcoreaddons = callPackage ./kcoreaddons.nix {}; + kcrash = callPackage ./kcrash.nix {}; + kdbusaddons = callPackage ./kdbusaddons.nix {}; + kdeclarative = callPackage ./kdeclarative.nix {}; + kded = callPackage ./kded.nix {}; + kdelibs4support = callPackage ./kdelibs4support.nix {}; + kdesignerplugin = callPackage ./kdesignerplugin.nix {}; + kdewebkit = callPackage ./kdewebkit.nix {}; + kdesu = callPackage ./kdesu.nix {}; + kdnssd = callPackage ./kdnssd.nix {}; + kdoctools = callPackage ./kdoctools {}; + kemoticons = callPackage ./kemoticons.nix {}; + kfilemetadata = callPackage ./kfilemetadata.nix {}; + kglobalaccel = callPackage ./kglobalaccel.nix {}; + kguiaddons = callPackage ./kguiaddons.nix {}; + khtml = callPackage ./khtml.nix {}; + ki18n = callPackage ./ki18n.nix {}; + kiconthemes = callPackage ./kiconthemes.nix {}; + kidletime = callPackage ./kidletime.nix {}; + kimageformats = callPackage ./kimageformats.nix {}; + kinit = callPackage ./kinit {}; + kio = callPackage ./kio.nix {}; + kitemmodels = callPackage ./kitemmodels.nix {}; + kitemviews = callPackage ./kitemviews.nix {}; + kjobwidgets = callPackage ./kjobwidgets.nix {}; + kjs = callPackage ./kjs.nix {}; + kjsembed = callPackage ./kjsembed.nix {}; + kmediaplayer = callPackage ./kmediaplayer.nix {}; + knewstuff = callPackage ./knewstuff.nix {}; + knotifications = callPackage ./knotifications.nix {}; + knotifyconfig = callPackage ./knotifyconfig.nix {}; + kpackage = callPackage ./kpackage {}; + kparts = callPackage ./kparts.nix {}; + kpeople = callPackage ./kpeople.nix {}; + kplotting = callPackage ./kplotting.nix {}; + kpty = callPackage ./kpty.nix {}; + kross = callPackage ./kross.nix {}; + krunner = callPackage ./krunner.nix {}; + kservice = callPackage ./kservice {}; + ktexteditor = callPackage ./ktexteditor {}; + ktextwidgets = callPackage ./ktextwidgets.nix {}; + kunitconversion = callPackage ./kunitconversion.nix {}; + kwallet = callPackage ./kwallet.nix {}; + kwidgetsaddons = callPackage ./kwidgetsaddons.nix {}; + kwindowsystem = callPackage ./kwindowsystem.nix {}; + kxmlgui = callPackage ./kxmlgui.nix {}; + kxmlrpcclient = callPackage ./kxmlrpcclient.nix {}; + modemmanager-qt = callPackage ./modemmanager-qt.nix {}; + networkmanager-qt = callPackage ./networkmanager-qt.nix {}; + plasma-framework = callPackage ./plasma-framework {}; + solid = callPackage ./solid.nix {}; + sonnet = callPackage ./sonnet.nix {}; + threadweaver = callPackage ./threadweaver.nix {}; + }; + + newScope = scope: pkgs.qt55Libs.newScope ({ inherit mkDerivation; } // scope); + +in lib.makeScope newScope addPackages diff --git a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/0001-extra-cmake-modules-paths.patch new file mode 100644 index 00000000000..9717716faf5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/0001-extra-cmake-modules-paths.patch @@ -0,0 +1,74 @@ +From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Fri, 20 Feb 2015 23:17:39 -0600 +Subject: [PATCH] extra-cmake-modules paths + +--- + kde-modules/KDEInstallDirs.cmake | 37 ++++--------------------------------- + 1 file changed, 4 insertions(+), 33 deletions(-) + +diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake +index b7cd34d..2f868ac 100644 +--- a/kde-modules/KDEInstallDirs.cmake ++++ b/kde-modules/KDEInstallDirs.cmake +@@ -193,37 +193,8 @@ + # (To distribute this file outside of extra-cmake-modules, substitute the full + # License text for the above reference.) + +-# Figure out what the default install directory for libraries should be. +-# This is based on the logic in GNUInstallDirs, but simplified (the +-# GNUInstallDirs code deals with re-configuring, but that is dealt with +-# by the _define_* macros in this module). ++# The default library directory on NixOS is *always* /lib. + set(_LIBDIR_DEFAULT "lib") +-# Override this default 'lib' with 'lib64' iff: +-# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling +-# - we are NOT on debian +-# - we are on a 64 bits system +-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf +-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if +-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" +-# See http://wiki.debian.org/Multiarch +-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") +- AND NOT CMAKE_CROSSCOMPILING) +- if (EXISTS "/etc/debian_version") # is this a debian system ? +- if(CMAKE_LIBRARY_ARCHITECTURE) +- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") +- endif() +- else() # not debian, rely on CMAKE_SIZEOF_VOID_P: +- if(NOT DEFINED CMAKE_SIZEOF_VOID_P) +- message(AUTHOR_WARNING +- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. " +- "Please enable at least one language before including KDEInstallDirs.") +- else() +- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") +- set(_LIBDIR_DEFAULT "lib64") +- endif() +- endif() +- endif() +-endif() + + set(_gnu_install_dirs_vars + BINDIR +@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) + "QtQuick2 imports" + QML_INSTALL_DIR) + else() +- _define_relative(QTPLUGINDIR LIBDIR "plugins" ++ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins" + "Qt plugins" + QT_PLUGIN_INSTALL_DIR) + +- _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports" ++ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports" + "QtQuick1 imports" + IMPORTS_INSTALL_DIR) + +- _define_relative(QMLDIR LIBDIR "qml" ++ _define_relative(QMLDIR LIBDIR "qt5/qml" + "QtQuick2 imports" + QML_INSTALL_DIR) + endif() +-- +2.3.0 + diff --git a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/default.nix new file mode 100644 index 00000000000..2bf9df33b3c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/default.nix @@ -0,0 +1,17 @@ +{ mkDerivation, lib, stdenv, cmake, pkgconfig, qttools }: + +mkDerivation { + name = "extra-cmake-modules"; + setupHook = ./setup-hook.sh; + patches = [ ./0001-extra-cmake-modules-paths.patch ]; + + # It is OK to propagate these inputs as long as + # extra-cmake-modules is never a propagated input + # of some other derivation. + propagatedNativeBuildInputs = [ cmake pkgconfig qttools ]; + + meta = { + license = stdenv.lib.licenses.bsd2; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/setup-hook.sh new file mode 100644 index 00000000000..ce9aafb90e8 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/setup-hook.sh @@ -0,0 +1,4 @@ +wrapKDEProgram() { + KSERVICE_BUILD_KDESYCOCA=${KDESYCOCA:+1} + wrapQtProgram "$1" ${KDESYCOCA:+--set KDESYCOCA "$KDESYCOCA"} "$@" +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.13/fetchsrcs.sh new file mode 100755 index 00000000000..a329d8b8562 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/fetchsrcs.sh @@ -0,0 +1,47 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils findutils gnused nix wget + +set -x + +# The trailing slash at the end is necessary! +RELEASE_URL="http://download.kde.org/stable/frameworks/5.13/" +EXTRA_WGET_ARGS='-A *.tar.xz' + +mkdir tmp; cd tmp + +wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS + +cat >../srcs.nix <>../srcs.nix <>../srcs.nix + +cd .. diff --git a/pkgs/development/libraries/kde-frameworks-5.13/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.13/frameworkintegration.nix new file mode 100644 index 00000000000..11e0d6e6f3b --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/frameworkintegration.nix @@ -0,0 +1,34 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kbookmarks +, kcompletion +, kconfig +, kconfigwidgets +, ki18n +, kiconthemes +, kio +, knotifications +, kwidgetsaddons +, libXcursor +, qtx11extras +}: + +mkDerivation { + name = "frameworkintegration"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kbookmarks + kcompletion + kconfig + ki18n + kio + knotifications + kwidgetsaddons + libXcursor + qtx11extras + ]; + propagatedBuildInputs = [ kconfigwidgets kiconthemes ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.13/kactivities.nix new file mode 100644 index 00000000000..81bc0949cbf --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kactivities.nix @@ -0,0 +1,42 @@ +{ mkDerivation, lib +, extra-cmake-modules +, boost +, kcmutils +, kconfig +, kcoreaddons +, kdbusaddons +, kdeclarative +, kglobalaccel +, ki18n +, kio +, kservice +, kwindowsystem +, kxmlgui +, qtdeclarative +}: + +mkDerivation { + name = "kactivities"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + boost + kcmutils + kconfig + kcoreaddons + kdbusaddons + kdeclarative + kglobalaccel + ki18n + kio + kservice + kwindowsystem + kxmlgui + qtdeclarative + ]; + postInstall = '' + wrapKDEProgram "$out/bin/kactivitymanagerd" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.13/kapidox.nix new file mode 100644 index 00000000000..a1fe75bafb9 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kapidox.nix @@ -0,0 +1,12 @@ +{ mkDerivation, lib +, extra-cmake-modules +, python +}: + +mkDerivation { + name = "kapidox"; + nativeBuildInputs = [ extra-cmake-modules python ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.13/karchive.nix new file mode 100644 index 00000000000..7b09c171543 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/karchive.nix @@ -0,0 +1,11 @@ +{ mkDerivation, lib +, extra-cmake-modules +}: + +mkDerivation { + name = "karchive"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix new file mode 100644 index 00000000000..29b539de96e --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix @@ -0,0 +1,16 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kcoreaddons +, polkitQt +}: + +mkDerivation { + name = "kauth"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ polkitQt ]; + propagatedBuildInputs = [ kcoreaddons ]; + patches = [ ./kauth-policy-install.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.13/kauth/kauth-policy-install.patch new file mode 100644 index 00000000000..340155256f2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kauth/kauth-policy-install.patch @@ -0,0 +1,13 @@ +diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in +index e859ec7..9a8ab18 100644 +--- a/KF5AuthConfig.cmake.in ++++ b/KF5AuthConfig.cmake.in +@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/") + + set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@") + set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@") +-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@") ++set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions") + set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@") + + find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.13/kbookmarks.nix new file mode 100644 index 00000000000..ad9e30928bc --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kbookmarks.nix @@ -0,0 +1,25 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kcodecs +, kconfig +, kconfigwidgets +, kcoreaddons +, kiconthemes +, kxmlgui +}: + +mkDerivation { + name = "kbookmarks"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcodecs + kconfig + kconfigwidgets + kcoreaddons + kiconthemes + kxmlgui + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/default.nix new file mode 100644 index 00000000000..93170e440f8 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kconfigwidgets +, kcoreaddons +, kdeclarative +, ki18n +, kiconthemes +, kitemviews +, kpackage +, kservice +, kxmlgui +}: + +mkDerivation { + name = "kcmutils"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcoreaddons + kdeclarative + ki18n + kiconthemes + kitemviews + kpackage + kxmlgui + ]; + propagatedBuildInputs = [ kconfigwidgets kservice ]; + patches = [ ./kcmutils-pluginselector-follow-symlinks.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/kcmutils-pluginselector-follow-symlinks.patch new file mode 100644 index 00000000000..47b8dfad180 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/kcmutils-pluginselector-follow-symlinks.patch @@ -0,0 +1,13 @@ +diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp +index c63241b..2243f94 100644 +--- a/src/kpluginselector.cpp ++++ b/src/kpluginselector.cpp +@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName, + QStringList desktopFileNames; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); + Q_FOREACH (const QString &dir, dirs) { +- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + desktopFileNames.append(it.next()); + } diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcodecs.nix new file mode 100644 index 00000000000..2e6106ef3f1 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kcodecs.nix @@ -0,0 +1,11 @@ +{ mkDerivation, lib +, extra-cmake-modules +}: + +mkDerivation { + name = "kcodecs"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix new file mode 100644 index 00000000000..94624933f43 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix @@ -0,0 +1,14 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kconfig +, kwidgetsaddons +}: + +mkDerivation { + name = "kcompletion"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kconfig kwidgetsaddons ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix new file mode 100644 index 00000000000..fc8ae724470 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix @@ -0,0 +1,15 @@ +{ mkDerivation, lib +, extra-cmake-modules +}: + +mkDerivation { + name = "kconfig"; + nativeBuildInputs = [ extra-cmake-modules ]; + postInstall = '' + wrapKDEProgram "$out/bin/kreadconfig5" + wrapKDEProgram "$out/bin/kwriteconfig5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/default.nix new file mode 100644 index 00000000000..14e838fc6fd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/default.nix @@ -0,0 +1,24 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kauth +, kcodecs +, kconfig +, kdoctools +, kguiaddons +, ki18n +, kwidgetsaddons +}: + +mkDerivation { + name = "kconfigwidgets"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kguiaddons ki18n ]; + propagatedBuildInputs = [ kauth kconfig kcodecs kwidgetsaddons ]; + patches = [ ./kconfigwidgets-helpclient-follow-symlinks.patch ]; + postInstall = '' + wrapKDEProgram "$out/bin/preparetips5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch new file mode 100644 index 00000000000..3bd946cbd84 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch @@ -0,0 +1,13 @@ +diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp +index 53a331e..80fbb01 100644 +--- a/src/khelpclient.cpp ++++ b/src/khelpclient.cpp +@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) + QString docPath; + const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); + Q_FOREACH (const QString &dir, desktopDirs) { +- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + const QString desktopPath(it.next()); + KDesktopFile desktopFile(desktopPath); diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcoreaddons.nix new file mode 100644 index 00000000000..eef70e9f628 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kcoreaddons.nix @@ -0,0 +1,13 @@ +{ mkDerivation, lib +, extra-cmake-modules +, shared_mime_info +}: + +mkDerivation { + name = "kcoreaddons"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ shared_mime_info ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix new file mode 100644 index 00000000000..f51b6ba80cf --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix @@ -0,0 +1,15 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kcoreaddons +, kwindowsystem +, qtx11extras +}: + +mkDerivation { + name = "kcrash"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcoreaddons kwindowsystem qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdbusaddons.nix new file mode 100644 index 00000000000..3950a422583 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kdbusaddons.nix @@ -0,0 +1,16 @@ +{ mkDerivation, lib +, extra-cmake-modules +, qtx11extras +}: + +mkDerivation { + name = "kdbusaddons"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtx11extras ]; + postInstall = '' + wrapKDEProgram "$out/bin/kquitapp5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdeclarative.nix new file mode 100644 index 00000000000..8ef33e283bf --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kdeclarative.nix @@ -0,0 +1,30 @@ +{ mkDerivation, lib +, extra-cmake-modules +, epoxy +, kconfig +, kglobalaccel +, kguiaddons +, ki18n +, kiconthemes +, kio +, kpackage +, kwidgetsaddons +, kwindowsystem +, pkgconfig +, qtdeclarative +}: + +mkDerivation { + name = "kdeclarative"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons kwindowsystem + ]; + propagatedBuildInputs = [ kconfig kpackage qtdeclarative ]; + postInstall = '' + wrapKDEProgram "$out/bin/kpackagelauncherqml" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kded.nix b/pkgs/development/libraries/kde-frameworks-5.13/kded.nix new file mode 100644 index 00000000000..b0eb1e3da9f --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kded.nix @@ -0,0 +1,19 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kconfig +, kcoreaddons +, kcrash +, kdbusaddons +, kdoctools +, kinit +, kservice +}: + +mkDerivation { + name = "kded"; + buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdelibs4support.nix new file mode 100644 index 00000000000..b4f180f8c42 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kdelibs4support.nix @@ -0,0 +1,58 @@ +{ mkDerivation, lib +, extra-cmake-modules +, docbook_xml_dtd_45 +, kauth +, karchive +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, kcrash +, kdbusaddons +, kdesignerplugin +, kdoctools +, kemoticons +, kglobalaccel +, kguiaddons +, ki18n +, kiconthemes +, kio +, kitemmodels +, kinit +, knotifications +, kparts +, kservice +, ktextwidgets +, kunitconversion +, kwidgetsaddons +, kwindowsystem +, kxmlgui +, networkmanager +, qtsvg +, qtx11extras +, xlibs +}: + +# TODO: debug docbook detection + +mkDerivation { + name = "kdelibs4support"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcompletion kconfig kglobalaccel ki18n kio kservice kwidgetsaddons + kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM + ]; + propagatedBuildInputs = [ + kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons + kdesignerplugin kemoticons kguiaddons kiconthemes kitemmodels + kinit knotifications kparts ktextwidgets kunitconversion + kwindowsystem + ]; + cmakeFlags = [ + "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" + "-DDocBookXML4_DTD_VERSION=4.5" + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdesignerplugin.nix new file mode 100644 index 00000000000..da5c732f33c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kdesignerplugin.nix @@ -0,0 +1,30 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, kdewebkit +, kdoctools +, kiconthemes +, kio +, kitemviews +, kplotting +, ktextwidgets +, kwidgetsaddons +, kxmlgui +, sonnet +}: + +mkDerivation { + name = "kdesignerplugin"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit + kiconthemes kio kitemviews kplotting ktextwidgets kwidgetsaddons + kxmlgui sonnet + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdesu.nix new file mode 100644 index 00000000000..cf67a0d7d08 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kdesu.nix @@ -0,0 +1,17 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kcoreaddons +, ki18n +, kpty +, kservice +}: + +mkDerivation { + name = "kdesu"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcoreaddons ki18n kservice ]; + propagatedBuildInputs = [ kpty ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdewebkit.nix new file mode 100644 index 00000000000..841e982d0e2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kdewebkit.nix @@ -0,0 +1,22 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kconfig +, kcoreaddons +, ki18n +, kio +, kjobwidgets +, kparts +, kservice +, kwallet +, qtwebkit +}: + +mkDerivation { + name = "kdewebkit"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kconfig kcoreaddons ki18n kio kjobwidgets kparts kservice kwallet ]; + propagatedBuildInputs = [ qtwebkit ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdnssd.nix new file mode 100644 index 00000000000..960e0db4792 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kdnssd.nix @@ -0,0 +1,13 @@ +{ mkDerivation, lib +, extra-cmake-modules +, avahi +}: + +mkDerivation { + name = "kdnssd"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ avahi ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix new file mode 100644 index 00000000000..74f28113873 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix @@ -0,0 +1,24 @@ +{ mkDerivation, lib +, extra-cmake-modules +, docbook_xml_dtd_45 +, docbook5_xsl +, karchive +, ki18n +, perl +, perlPackages +}: + +mkDerivation { + name = "kdoctools"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ karchive ki18n ]; + propagatedNativeBuildInputs = [ perl perlPackages.URI ]; + cmakeFlags = [ + "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" + "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" + ]; + patches = [ ./kdoctools-no-find-docbook-xml.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/kdoctools-no-find-docbook-xml.patch new file mode 100644 index 00000000000..4e3a33efab3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/kdoctools-no-find-docbook-xml.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c4863c..f731775 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES + ) + + +-find_package(DocBookXML4 "4.5") + + set_package_properties(DocBookXML4 PROPERTIES + TYPE REQUIRED diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kemoticons.nix new file mode 100644 index 00000000000..aa7962bfe52 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kemoticons.nix @@ -0,0 +1,17 @@ +{ mkDerivation, lib +, extra-cmake-modules +, karchive +, kconfig +, kcoreaddons +, kservice +}: + +mkDerivation { + name = "kemoticons"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ karchive kconfig kcoreaddons ]; + propagatedBuildInputs = [ kservice ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.13/kfilemetadata.nix new file mode 100644 index 00000000000..673c76e581c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kfilemetadata.nix @@ -0,0 +1,22 @@ +{ mkDerivation, lib +, extra-cmake-modules +, attr +, ebook_tools +, exiv2 +, ffmpeg +, karchive +, ki18n +, popplerQt +, qtbase +, taglib +}: + +mkDerivation { + name = "kfilemetadata"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive ki18n popplerQt taglib ]; + propagatedBuildInputs = [ qtbase ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix new file mode 100644 index 00000000000..11bcfc9576d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix @@ -0,0 +1,21 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kconfig +, kcoreaddons +, kcrash +, kdbusaddons +, kwindowsystem +, qtx11extras +}: + +mkDerivation { + name = "kglobalaccel"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras ]; + postInstall = '' + wrapKDEProgram "$out/bin/kglobalaccel5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kguiaddons.nix new file mode 100644 index 00000000000..ccb46f4acca --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kguiaddons.nix @@ -0,0 +1,13 @@ +{ mkDerivation, lib +, extra-cmake-modules +, qtx11extras +}: + +mkDerivation { + name = "kguiaddons"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.13/khtml.nix new file mode 100644 index 00000000000..f0b2d8ca3cd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/khtml.nix @@ -0,0 +1,35 @@ +{ mkDerivation, lib +, extra-cmake-modules +, giflib +, karchive +, kcodecs +, kglobalaccel +, ki18n +, kiconthemes +, kio +, kjs +, knotifications +, kparts +, ktextwidgets +, kwallet +, kwidgetsaddons +, kwindowsystem +, kxmlgui +, perl +, phonon +, qtx11extras +, sonnet +}: + +mkDerivation { + name = "khtml"; + nativeBuildInputs = [ extra-cmake-modules perl ]; + buildInputs = [ + giflib karchive kglobalaccel kiconthemes knotifications kwallet + kwidgetsaddons kwindowsystem kxmlgui phonon qtx11extras sonnet + ]; + propagatedBuildInputs = [ kcodecs ki18n kio kjs kparts ktextwidgets ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix new file mode 100644 index 00000000000..e77bf687b74 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix @@ -0,0 +1,16 @@ +{ mkDerivation, lib +, extra-cmake-modules +, gettext +, python +, qtscript +}: + +mkDerivation { + name = "ki18n"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtscript ]; + propagatedNativeBuildInputs = [ gettext python ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.13/kiconthemes.nix new file mode 100644 index 00000000000..f093b3f9dec --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kiconthemes.nix @@ -0,0 +1,16 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kconfigwidgets +, ki18n +, kitemviews +, qtsvg +}: + +mkDerivation { + name = "kiconthemes"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kconfigwidgets ki18n kitemviews qtsvg ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix new file mode 100644 index 00000000000..4e5073f2b73 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix @@ -0,0 +1,15 @@ +{ mkDerivation, lib +, extra-cmake-modules +, qtbase +, qtx11extras +}: + +mkDerivation { + name = "kidletime"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtx11extras ]; + propagatedBuildInputs = [ qtbase ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix new file mode 100644 index 00000000000..019e7ab42be --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix @@ -0,0 +1,13 @@ +{ mkDerivation, lib +, extra-cmake-modules +, ilmbase +}: + +mkDerivation { + name = "kimageformats"; + nativeBuildInputs = [ extra-cmake-modules ]; + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.13/kinit/0001-kinit-libpath.patch new file mode 100644 index 00000000000..9c76079a382 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kinit/0001-kinit-libpath.patch @@ -0,0 +1,42 @@ +From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sat, 13 Jun 2015 08:57:55 -0500 +Subject: [PATCH] kinit libpath + +--- + src/kdeinit/kinit.cpp | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp +index 9e775b6..0ac5646 100644 +--- a/src/kdeinit/kinit.cpp ++++ b/src/kdeinit/kinit.cpp +@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args, + if (!libpath.isEmpty()) { + if (!l.load()) { + if (libpath_relative) { +- // NB: Because Qt makes the actual dlopen() call, the +- // RUNPATH of kdeinit is *not* respected - see +- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 +- // - so we try hacking it in ourselves +- QString install_lib_dir = QFile::decodeName( +- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); +- libpath = install_lib_dir + libpath; +- l.setFileName(libpath); ++ // Use QT_PLUGIN_PATH to find shared library directories ++ // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5 ++ // shared libraries should be in /lib/qt5/plugins/../../ ++ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]")); ++ const QString up = QString::fromLocal8Bit("/../../"); ++ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts); ++ Q_FOREACH (const QString &path, paths) { ++ l.setFileName(path + up + libpath); + l.load(); ++ if (l.isLoaded()) break; ++ } + } + } + if (!l.isLoaded()) { +-- +2.4.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix new file mode 100644 index 00000000000..fd518bc9360 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix @@ -0,0 +1,24 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kconfig +, kcrash +, kdoctools +, ki18n +, kio +, kservice +, kwindowsystem +, libcap +, libcap_progs +}: + +# TODO: setuid wrapper + +mkDerivation { + name = "kinit"; + nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ]; + buildInputs = [ kconfig kcrash ki18n kio kservice kwindowsystem libcap ]; + patches = [ ./0001-kinit-libpath.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kio.nix b/pkgs/development/libraries/kde-frameworks-5.13/kio.nix new file mode 100644 index 00000000000..d6d2968bed0 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kio.nix @@ -0,0 +1,48 @@ +{ mkDerivation, lib +, extra-cmake-modules +, acl +, karchive +, kbookmarks +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdoctools +, ki18n +, kiconthemes +, kitemviews +, kjobwidgets +, knotifications +, kservice +, ktextwidgets +, kwallet +, kwidgetsaddons +, kwindowsystem +, kxmlgui +, qtscript +, qtx11extras +, solid +}: + +mkDerivation { + name = "kio"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + acl karchive kconfig kcoreaddons kdbusaddons ki18n kiconthemes + knotifications ktextwidgets kwallet kwidgetsaddons kwindowsystem + qtscript qtx11extras + ]; + propagatedBuildInputs = [ + kbookmarks kcompletion kconfigwidgets kitemviews kjobwidgets kservice kxmlgui solid + ]; + postInstall = '' + wrapKDEProgram "$out/bin/kcookiejar5" + wrapKDEProgram "$out/bin/ktelnetservice5" + wrapKDEProgram "$out/bin/ktrash5" + wrapKDEProgram "$out/bin/kmailservice5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.13/kitemmodels.nix new file mode 100644 index 00000000000..f82f9fdf14a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kitemmodels.nix @@ -0,0 +1,11 @@ +{ mkDerivation, lib +, extra-cmake-modules +}: + +mkDerivation { + name = "kitemmodels"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix new file mode 100644 index 00000000000..45888b9e7e3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix @@ -0,0 +1,11 @@ +{ mkDerivation, lib +, extra-cmake-modules +}: + +mkDerivation { + name = "kitemviews"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix new file mode 100644 index 00000000000..32103bbc0d7 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix @@ -0,0 +1,15 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kcoreaddons +, kwidgetsaddons +, qtx11extras +}: + +mkDerivation { + name = "kjobwidgets"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.13/kjs.nix new file mode 100644 index 00000000000..de473062c23 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kjs.nix @@ -0,0 +1,15 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kdoctools +}: + +mkDerivation { + name = "kjs"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + postInstall = '' + wrapKDEProgram "$out/bin/kjs5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.13/kjsembed.nix new file mode 100644 index 00000000000..e7e74ba6126 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kjsembed.nix @@ -0,0 +1,21 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kdoctools +, ki18n +, kjs +, qtsvg +}: + +mkDerivation { + name = "kjsembed"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ qtsvg ]; + propagatedBuildInputs = [ ki18n kjs ]; + postInstall = '' + wrapKDEProgram "$out/bin/kjscmd5" + wrapKDEProgram "$out/bin/kjsconsole" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.13/kmediaplayer.nix new file mode 100644 index 00000000000..7ab5700a5e8 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kmediaplayer.nix @@ -0,0 +1,15 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kparts +, kxmlgui +}: + +mkDerivation { + name = "kmediaplayer"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kxmlgui ]; + propagatedBuildInputs = [ kparts ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.13/knewstuff.nix new file mode 100644 index 00000000000..5128f31270d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/knewstuff.nix @@ -0,0 +1,29 @@ +{ mkDerivation, lib +, extra-cmake-modules +, attica +, karchive +, kcompletion +, kconfig +, kcoreaddons +, ki18n +, kiconthemes +, kio +, kitemviews +, kservice +, ktextwidgets +, kwidgetsaddons +, kxmlgui +}: + +mkDerivation { + name = "knewstuff"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio + kitemviews ktextwidgets kwidgetsaddons + ]; + propagatedBuildInputs = [ attica kservice kxmlgui ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.13/knotifications.nix new file mode 100644 index 00000000000..c43598311a1 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/knotifications.nix @@ -0,0 +1,21 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kcodecs +, kconfig +, kcoreaddons +, kwindowsystem +, phonon +, qtx11extras +}: + +mkDerivation { + name = "knotifications"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcodecs kconfig kcoreaddons kwindowsystem + phonon qtx11extras + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.13/knotifyconfig.nix new file mode 100644 index 00000000000..b06539c3f01 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/knotifyconfig.nix @@ -0,0 +1,17 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kcompletion +, kconfig +, ki18n +, kio +, phonon +}: + +mkDerivation { + name = "knotifyconfig"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcompletion kconfig ki18n kio phonon ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.13/kpackage/0001-allow-external-paths.patch new file mode 100644 index 00000000000..440e979c008 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kpackage/0001-allow-external-paths.patch @@ -0,0 +1,25 @@ +From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 28 Jan 2015 07:15:30 -0600 +Subject: [PATCH] allow external paths + +--- + src/kpackage/package.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp +index eb4a09b..f70f1a1 100644 +--- a/src/kpackage/package.cpp ++++ b/src/kpackage/package.cpp +@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate() + : QSharedData(), + fallbackPackage(0), + metadata(0), +- externalPaths(false), ++ externalPaths(true), + valid(false), + checkedValid(false) + { +-- +2.1.4 + diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kpackage/default.nix new file mode 100644 index 00000000000..9250c769efc --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kpackage/default.nix @@ -0,0 +1,22 @@ +{ mkDerivation, lib +, extra-cmake-modules +, karchive +, kconfig +, kcoreaddons +, kdoctools +, ki18n +}: + +mkDerivation { + name = "kpackage"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ karchive kconfig ki18n ]; + propagatedBuildInputs = [ kcoreaddons ]; + patches = [ ./0001-allow-external-paths.patch ]; + postInstall = '' + wrapKDEProgram "$out/bin/kpackagetool5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.13/kparts.nix new file mode 100644 index 00000000000..65ddf9b6483 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kparts.nix @@ -0,0 +1,27 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kconfig +, kcoreaddons +, ki18n +, kiconthemes +, kio +, kjobwidgets +, knotifications +, kservice +, ktextwidgets +, kwidgetsaddons +, kxmlgui +}: + +mkDerivation { + name = "kparts"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kconfig kcoreaddons ki18n kiconthemes kjobwidgets knotifications + kservice kwidgetsaddons + ]; + propagatedBuildInputs = [ kio ktextwidgets kxmlgui ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.13/kpeople.nix new file mode 100644 index 00000000000..b5794bc6e89 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kpeople.nix @@ -0,0 +1,20 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kcoreaddons +, ki18n +, kitemviews +, kservice +, kwidgetsaddons +, qtdeclarative +}: + +mkDerivation { + name = "kpeople"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.13/kplotting.nix new file mode 100644 index 00000000000..41896853f64 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kplotting.nix @@ -0,0 +1,11 @@ +{ mkDerivation, lib +, extra-cmake-modules +}: + +mkDerivation { + name = "kplotting"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.13/kpty.nix new file mode 100644 index 00000000000..67b04af7156 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kpty.nix @@ -0,0 +1,15 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kcoreaddons +, ki18n +}: + +mkDerivation { + name = "kpty"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ ki18n ]; + propagatedBuildInputs = [ kcoreaddons ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kross.nix b/pkgs/development/libraries/kde-frameworks-5.13/kross.nix new file mode 100644 index 00000000000..d4025f9960f --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kross.nix @@ -0,0 +1,23 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kcompletion +, kcoreaddons +, kdoctools +, ki18n +, kiconthemes +, kio +, kparts +, kwidgetsaddons +, kxmlgui +, qtscript +}: + +mkDerivation { + name = "kross"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kcompletion kcoreaddons kxmlgui ]; + propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.13/krunner.nix new file mode 100644 index 00000000000..24f9c86d39e --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/krunner.nix @@ -0,0 +1,24 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kconfig +, kcoreaddons +, ki18n +, kio +, kservice +, plasma-framework +, qtquick1 +, solid +, threadweaver +}: + +mkDerivation { + name = "krunner"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kconfig kcoreaddons ki18n kio kservice qtquick1 solid threadweaver + ]; + propagatedBuildInputs = [ plasma-framework ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kservice/default.nix new file mode 100644 index 00000000000..40b8335f9b9 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kservice/default.nix @@ -0,0 +1,25 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kconfig +, kcoreaddons +, kcrash +, kdbusaddons +, kdoctools +, ki18n +, kwindowsystem +}: + +mkDerivation { + name = "kservice"; + setupHook = ./setup-hook.sh; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ]; + propagatedBuildInputs = [ kconfig ]; + patches = [ + ./kservice-kbuildsycoca-follow-symlinks.patch + ./kservice-kbuildsycoca-no-canonicalize-path.patch + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-follow-symlinks.patch new file mode 100644 index 00000000000..e9bc418544a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-follow-symlinks.patch @@ -0,0 +1,13 @@ +diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp +index 69b1427..9c37a49 100644 +--- a/src/kbuildsycoca/kbuildsycoca.cpp ++++ b/src/kbuildsycoca/kbuildsycoca.cpp +@@ -227,7 +227,7 @@ bool KBuildSycoca::build() + QStringList relFiles; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory); + Q_FOREACH (const QString &dir, dirs) { +- QDirIterator it(dir, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + const QString filePath = it.next(); + Q_ASSERT(filePath.startsWith(dir)); // due to the line below... diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch new file mode 100644 index 00000000000..7e21ebfe86f --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp +index 2eb1275..e39a36f 100644 +--- a/src/kbuildsycoca/vfolder_menu.cpp ++++ b/src/kbuildsycoca/vfolder_menu.cpp +@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR + } + + if (!relative) { +- QString resolved = QDir(dir).canonicalPath(); ++ QString resolved = QDir::cleanPath(dir); + if (!resolved.isEmpty()) { + dir = resolved; + } diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.13/kservice/setup-hook.sh new file mode 100644 index 00000000000..007876a0b30 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kservice/setup-hook.sh @@ -0,0 +1,13 @@ +export KDESYCOCA="$out/var/cache/kservices5/$name.sycoca" + +KSERVICE_BUILD_KDESYCOCA= + +buildKdeSycoca() { + if [[ -n "$KSERVICE_BUILD_KDESYCOCA" ]]; then + echo "building kdesycoca database in $KDESYCOCA" + mkdir -p "$(dirname $KDESYCOCA)" + kbuildsycoca5 --nosignal + fi +} + +preFixupPhases+=" buildKdeSycoca" diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/0001-no-qcoreapplication.patch new file mode 100644 index 00000000000..c2e77a537c5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/0001-no-qcoreapplication.patch @@ -0,0 +1,48 @@ +From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 15 Feb 2015 19:09:17 -0600 +Subject: [PATCH] no qcoreapplication + +--- + src/syntax/data/katehighlightingindexer.cpp | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp +index 3f02e8c..d1a865b 100644 +--- a/src/syntax/data/katehighlightingindexer.cpp ++++ b/src/syntax/data/katehighlightingindexer.cpp +@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName) + + int main(int argc, char *argv[]) + { +- // get app instance +- QCoreApplication app(argc, argv); +- + // ensure enough arguments are passed +- if (app.arguments().size() < 3) ++ if (argc < 3) + return 1; + + // open schema + QXmlSchema schema; +- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2)))) ++ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2])))) + return 2; + +- const QString hlFilenamesListing = app.arguments().value(3); ++ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]); + if (hlFilenamesListing.isEmpty()) { + return 1; + } +@@ -127,7 +124,7 @@ int main(int argc, char *argv[]) + return anyError; + + // create outfile, after all has worked! +- QFile outFile(app.arguments().at(1)); ++ QFile outFile(QString::fromLocal8Bit(argv[1])); + if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) + return 7; + +-- +2.1.4 + diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/default.nix new file mode 100644 index 00000000000..f6df912b902 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/default.nix @@ -0,0 +1,27 @@ +{ mkDerivation, lib +, extra-cmake-modules +, karchive +, kconfig +, kguiaddons +, ki18n +, kio +, kiconthemes +, kparts +, perl +, qtscript +, qtxmlpatterns +, sonnet +}: + +mkDerivation { + name = "ktexteditor"; + nativeBuildInputs = [ extra-cmake-modules perl ]; + buildInputs = [ + karchive kconfig kguiaddons ki18n kiconthemes kio kparts + qtscript qtxmlpatterns sonnet + ]; + patches = [ ./0001-no-qcoreapplication.patch ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.13/ktextwidgets.nix new file mode 100644 index 00000000000..006e5c114bd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/ktextwidgets.nix @@ -0,0 +1,23 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kcompletion +, kconfig +, kconfigwidgets +, ki18n +, kiconthemes +, kservice +, kwindowsystem +, sonnet +}: + +mkDerivation { + name = "ktextwidgets"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kcompletion kconfig kconfigwidgets kiconthemes kservice kwindowsystem + ]; + propagatedBuildInputs = [ ki18n sonnet ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.13/kunitconversion.nix new file mode 100644 index 00000000000..169b931ad2b --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kunitconversion.nix @@ -0,0 +1,13 @@ +{ mkDerivation, lib +, extra-cmake-modules +, ki18n +}: + +mkDerivation { + name = "kunitconversion"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ ki18n ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.13/kwallet.nix new file mode 100644 index 00000000000..6b8ddbc70e8 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kwallet.nix @@ -0,0 +1,30 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kconfig +, kcoreaddons +, kdbusaddons +, kdoctools +, ki18n +, kiconthemes +, knotifications +, kservice +, kwidgetsaddons +, kwindowsystem +, libgcrypt +}: + +mkDerivation { + name = "kwallet"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kconfig kcoreaddons kdbusaddons ki18n kiconthemes knotifications + kservice kwidgetsaddons kwindowsystem libgcrypt + ]; + postInstall = '' + wrapKDEProgram "$out/bin/kwalletd5" + wrapKDEProgram "$out/bin/kwallet-query" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kwidgetsaddons.nix new file mode 100644 index 00000000000..ce68adb521d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kwidgetsaddons.nix @@ -0,0 +1,11 @@ +{ mkDerivation, lib +, extra-cmake-modules +}: + +mkDerivation { + name = "kwidgetsaddons"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix new file mode 100644 index 00000000000..37d536b8363 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix @@ -0,0 +1,13 @@ +{ mkDerivation, lib +, extra-cmake-modules +, qtx11extras +}: + +mkDerivation { + name = "kwindowsystem"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtx11extras ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.13/kxmlgui.nix new file mode 100644 index 00000000000..c90900be82d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kxmlgui.nix @@ -0,0 +1,25 @@ +{ mkDerivation, lib +, extra-cmake-modules +, attica +, kconfig +, kconfigwidgets +, kglobalaccel +, ki18n +, kiconthemes +, kitemviews +, ktextwidgets +, kwindowsystem +, sonnet +}: + +mkDerivation { + name = "kxmlgui"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes + kitemviews ktextwidgets kwindowsystem sonnet + ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.13/kxmlrpcclient.nix new file mode 100644 index 00000000000..fae7cf7b89d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/kxmlrpcclient.nix @@ -0,0 +1,15 @@ +{ mkDerivation, lib +, extra-cmake-modules +, ki18n +, kio +}: + +mkDerivation { + name = "kxmlrpcclient"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ ki18n ]; + propagatedBuildInputs = [ kio ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.13/modemmanager-qt.nix new file mode 100644 index 00000000000..44f15d17ef9 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/modemmanager-qt.nix @@ -0,0 +1,13 @@ +{ mkDerivation, lib +, extra-cmake-modules +, modemmanager +}: + +mkDerivation { + name = "modemmanager-qt"; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ modemmanager ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix new file mode 100644 index 00000000000..4e8d77f102d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix @@ -0,0 +1,13 @@ +{ mkDerivation, lib +, extra-cmake-modules +, networkmanager +}: + +mkDerivation { + name = "networkmanager-qt"; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ networkmanager ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/plasma-framework/default.nix new file mode 100644 index 00000000000..b6d76e4f31a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/plasma-framework/default.nix @@ -0,0 +1,40 @@ +{ mkDerivation, lib +, extra-cmake-modules +, kactivities +, karchive +, kconfig +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdeclarative +, kdoctools +, kglobalaccel +, kguiaddons +, ki18n +, kiconthemes +, kio +, knotifications +, kpackage +, kservice +, kwindowsystem +, kxmlgui +, qtscript +, qtx11extras +}: + +mkDerivation { + name = "plasma-framework"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kactivities karchive kconfig kconfigwidgets kcoreaddons + kdbusaddons kdeclarative kglobalaccel kguiaddons ki18n kiconthemes + kio knotifications kwindowsystem kxmlgui qtscript qtx11extras + ]; + propagatedBuildInputs = [ kpackage kservice ]; + postInstall = '' + wrapKDEProgram "$out/bin/plasmapkg2" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/solid.nix b/pkgs/development/libraries/kde-frameworks-5.13/solid.nix new file mode 100644 index 00000000000..e5ea33fcf38 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/solid.nix @@ -0,0 +1,14 @@ +{ mkDerivation, lib +, extra-cmake-modules +}: + +mkDerivation { + name = "solid"; + nativeBuildInputs = [ extra-cmake-modules ]; + postInstall = '' + wrapKDEProgram "$out/bin/solid-hardware5" + ''; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.13/sonnet.nix new file mode 100644 index 00000000000..f5f8ea20a6a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/sonnet.nix @@ -0,0 +1,13 @@ +{ mkDerivation, lib +, extra-cmake-modules +, hunspell +}: + +mkDerivation { + name = "sonnet"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ hunspell ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.13/srcs.nix new file mode 100644 index 00000000000..9cfb9c2006a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/srcs.nix @@ -0,0 +1,549 @@ +# DO NOT EDIT! This file is generated automatically by manifest.sh +{ fetchurl, mirror }: + +{ + kiconthemes = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kiconthemes-5.13.0.tar.xz"; + sha256 = "1zsqmq1vzpiflnhr4ydwyg84cfima2hh0m61pgsxki98a8cfjz78"; + name = "kiconthemes-5.13.0.tar.xz"; + }; + }; + kitemmodels = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kitemmodels-5.13.0.tar.xz"; + sha256 = "1bcnssm0sp4xs2wm9x65705671y97bhgjlbqvngdw95qr8mjalda"; + name = "kitemmodels-5.13.0.tar.xz"; + }; + }; + kactivities = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kactivities-5.13.0.tar.xz"; + sha256 = "0k1f3iliwws30f9d3gfrx3cxqcmr3v9w0p4nxnk35qa7bflkw2jp"; + name = "kactivities-5.13.0.tar.xz"; + }; + }; + threadweaver = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/threadweaver-5.13.0.tar.xz"; + sha256 = "06hvraianc559plk50rfg4a7rwykq7s9ak343xylm37mg3sx3myn"; + name = "threadweaver-5.13.0.tar.xz"; + }; + }; + bluez-qt = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/bluez-qt-5.13.0.tar.xz"; + sha256 = "0ccylfkph8kxni2kfbdk7zzvywsn447kkvfx5xm63l19acff74c8"; + name = "bluez-qt-5.13.0.tar.xz"; + }; + }; + plasma-framework = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/plasma-framework-5.13.0.tar.xz"; + sha256 = "0fk3a7xzhi761kl2xwxhxv2kp4cblqzn7ylk6q60x2cr3vd3jxgb"; + name = "plasma-framework-5.13.0.tar.xz"; + }; + }; + kguiaddons = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kguiaddons-5.13.0.tar.xz"; + sha256 = "0p33i1hwzcbczxdw8mnkknb35v7n8m6x9jr9gysvzhg76l2z6ca7"; + name = "kguiaddons-5.13.0.tar.xz"; + }; + }; + ktexteditor = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/ktexteditor-5.13.0.tar.xz"; + sha256 = "1paiqpi73pvhqjcgk9l7agqk4s9pw9fghh1ipfw6clklrkpwjy2f"; + name = "ktexteditor-5.13.0.tar.xz"; + }; + }; + kinit = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kinit-5.13.0.tar.xz"; + sha256 = "06jcznxw346g6cr08ykgl2bc8wfann5s4rs0py6ah1al5py87jbq"; + name = "kinit-5.13.0.tar.xz"; + }; + }; + kxmlgui = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kxmlgui-5.13.0.tar.xz"; + sha256 = "06i873lsy0k67jdipzakc5gxmya82s8mkprkzb7pvac2ird2y66q"; + name = "kxmlgui-5.13.0.tar.xz"; + }; + }; + kdbusaddons = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kdbusaddons-5.13.0.tar.xz"; + sha256 = "1w118l5qc0kn5fmv5dqaxidxjsgzzq4ak9pk6vgafrdf7f79dy82"; + name = "kdbusaddons-5.13.0.tar.xz"; + }; + }; + kunitconversion = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kunitconversion-5.13.0.tar.xz"; + sha256 = "1cff7ighx6r64vv5wc88gnnq4k0c6c18k92nlj56b61g94sjx5xp"; + name = "kunitconversion-5.13.0.tar.xz"; + }; + }; + kemoticons = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kemoticons-5.13.0.tar.xz"; + sha256 = "0cxi6gldp9qpi47g0chg6bhr17w43bv36pf2gg2dsy5mymnw1iaj"; + name = "kemoticons-5.13.0.tar.xz"; + }; + }; + kcompletion = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kcompletion-5.13.0.tar.xz"; + sha256 = "0j47bwi7sw2khyi3qp0b77npgf40wfax1j9zic68xg1yjf4y52b4"; + name = "kcompletion-5.13.0.tar.xz"; + }; + }; + kpackage = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kpackage-5.13.0.tar.xz"; + sha256 = "0ybdzx33gcpb4j18vnv99hbycrlwxzhwblz07m1a0q1k2x004hla"; + name = "kpackage-5.13.0.tar.xz"; + }; + }; + kpty = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kpty-5.13.0.tar.xz"; + sha256 = "0c37zv1lrdma4659chmh27naxflhjz614h385im0m717hx67v5v0"; + name = "kpty-5.13.0.tar.xz"; + }; + }; + kservice = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kservice-5.13.0.tar.xz"; + sha256 = "1a7pz9m948xfiqphm29k7wnc24qv5xm8zb7f61mfbmzic18p4076"; + name = "kservice-5.13.0.tar.xz"; + }; + }; + kwidgetsaddons = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kwidgetsaddons-5.13.0.tar.xz"; + sha256 = "19s31brrqhb1vncc4rkik42l4si28ky3d5ysvnyx7mw2jip4929i"; + name = "kwidgetsaddons-5.13.0.tar.xz"; + }; + }; + kimageformats = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kimageformats-5.13.0.tar.xz"; + sha256 = "0lqraljikwkp88wnb1zxmylk7gn7rsp9301jn2qff3i0aa8m56ly"; + name = "kimageformats-5.13.0.tar.xz"; + }; + }; + kwindowsystem = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kwindowsystem-5.13.0.tar.xz"; + sha256 = "18ihvj1s4apsb647gbp8ghl083f3idpld693vwi138fsk89nhn67"; + name = "kwindowsystem-5.13.0.tar.xz"; + }; + }; + kxmlrpcclient = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kxmlrpcclient-5.13.0.tar.xz"; + sha256 = "18gdfb2yqzyid6zhx98xwd3vk2bnvxgpsk0dmy0098b9jl5gi39h"; + name = "kxmlrpcclient-5.13.0.tar.xz"; + }; + }; + kconfig = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kconfig-5.13.0.tar.xz"; + sha256 = "0qhymvqccl568ib975fx2jpm91ydsixx8lmf2803m89nad3bi77p"; + name = "kconfig-5.13.0.tar.xz"; + }; + }; + kdeclarative = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kdeclarative-5.13.0.tar.xz"; + sha256 = "1c65ls02pqg1apmxvw3xhi8d7i4pwvx777jp755zbz6f0k2q5h14"; + name = "kdeclarative-5.13.0.tar.xz"; + }; + }; + kapidox = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kapidox-5.13.0.tar.xz"; + sha256 = "0gg72qli7yix0v6riywbw0iw3y28jzk84p161lh7izql8kb463zj"; + name = "kapidox-5.13.0.tar.xz"; + }; + }; + knotifyconfig = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/knotifyconfig-5.13.0.tar.xz"; + sha256 = "19my0x60vhhngdzb5nr0cdi5yby4113pzqzg39wslbb1n5mcfqky"; + name = "knotifyconfig-5.13.0.tar.xz"; + }; + }; + kcodecs = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kcodecs-5.13.0.tar.xz"; + sha256 = "0b1jaxkkqmi7r013vpyhhqaqbg6hwc4nb0bm23nr1az9qasdvxzm"; + name = "kcodecs-5.13.0.tar.xz"; + }; + }; + kdnssd = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kdnssd-5.13.0.tar.xz"; + sha256 = "1jaa8lwqq4y1rl381j85qzxxyqw2if95rs8q5lsm14xq9jgwrf6r"; + name = "kdnssd-5.13.0.tar.xz"; + }; + }; + ktextwidgets = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/ktextwidgets-5.13.0.tar.xz"; + sha256 = "1p38j96z19fy1pdc249myl5mm0nbs7nrrhkmgfjig24lamivy98h"; + name = "ktextwidgets-5.13.0.tar.xz"; + }; + }; + kauth = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kauth-5.13.0.tar.xz"; + sha256 = "1j1kx9dypirpw41i8cx8dylwqaqm8rdbkxb0xmvyi7x8pax7rmkk"; + name = "kauth-5.13.0.tar.xz"; + }; + }; + kplotting = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kplotting-5.13.0.tar.xz"; + sha256 = "0f4vafy4b473407lm2kazllxzdiq1blvmypab7jlk0bj206vmdhq"; + name = "kplotting-5.13.0.tar.xz"; + }; + }; + ki18n = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/ki18n-5.13.0.tar.xz"; + sha256 = "1izriaip8r7cgm36mid6fxsvg661311lm6aalqaxq9xa70lkq3xm"; + name = "ki18n-5.13.0.tar.xz"; + }; + }; + knotifications = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/knotifications-5.13.0.tar.xz"; + sha256 = "04n50hkg6h3j49l1bi0igr79vgb8xfw74mbaw5s20nw55y2xyziv"; + name = "knotifications-5.13.0.tar.xz"; + }; + }; + kitemviews = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kitemviews-5.13.0.tar.xz"; + sha256 = "0iazr2fyhksa3wsfrqaknxs74h66fb6drg9vcg18dml9mv0v9jgw"; + name = "kitemviews-5.13.0.tar.xz"; + }; + }; + kcoreaddons = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kcoreaddons-5.13.0.tar.xz"; + sha256 = "0qc9lmc90bhrzaaf611vn7x5z549yvl1dk2ba726qaxb8hf5fhmx"; + name = "kcoreaddons-5.13.0.tar.xz"; + }; + }; + kwallet = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kwallet-5.13.0.tar.xz"; + sha256 = "0p7as0ma40dssd171mpi68sdih5fr03lcwvhy3zazhhpf5gjfwv8"; + name = "kwallet-5.13.0.tar.xz"; + }; + }; + modemmanager-qt = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/modemmanager-qt-5.13.0.tar.xz"; + sha256 = "17a4d7pp2qj7zvxfd8qicj332n25nj6d8xs585fkqlwsk5qvv5mh"; + name = "modemmanager-qt-5.13.0.tar.xz"; + }; + }; + kio = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kio-5.13.0.tar.xz"; + sha256 = "1m6vids0ahdvqw1wgiss11cb6z2x81acig8x38jgjna8al6dw7y3"; + name = "kio-5.13.0.tar.xz"; + }; + }; + baloo = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/baloo-5.13.0.tar.xz"; + sha256 = "159gkr4xsyj7sb6dqvjlldyl8hdm0sgzhbczb24q182dnwqrmmbq"; + name = "baloo-5.13.0.tar.xz"; + }; + }; + karchive = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/karchive-5.13.0.tar.xz"; + sha256 = "0qg90h4iiyb3frnqs01r440pan1m0mn6y0b4025ync1g50iyf1jz"; + name = "karchive-5.13.0.tar.xz"; + }; + }; + kdoctools = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kdoctools-5.13.0.tar.xz"; + sha256 = "0604rmrg6b8h4pw14kwal04s21f9gkrf495csj3jsm7042z5p6rf"; + name = "kdoctools-5.13.0.tar.xz"; + }; + }; + kparts = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kparts-5.13.0.tar.xz"; + sha256 = "1mqklszbhlk8pdwig88yqa5jpjbdzkz9q618c4029aqiazzjqs39"; + name = "kparts-5.13.0.tar.xz"; + }; + }; + kdewebkit = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kdewebkit-5.13.0.tar.xz"; + sha256 = "1n8x0biy5s73qihx9niivhmfdfglnai360k4llpjq9vhd8fassjx"; + name = "kdewebkit-5.13.0.tar.xz"; + }; + }; + kidletime = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kidletime-5.13.0.tar.xz"; + sha256 = "1d6p4ld8wday3sb3gdvivigw7vk33akawf531ghc8rhmi7mr2db2"; + name = "kidletime-5.13.0.tar.xz"; + }; + }; + extra-cmake-modules = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/extra-cmake-modules-5.13.0.tar.xz"; + sha256 = "1hnmsghfnl99ihgnp90pbh3ngh4l6n6d5g7ial6bfzrlfn588lms"; + name = "extra-cmake-modules-5.13.0.tar.xz"; + }; + }; + frameworkintegration = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/frameworkintegration-5.13.0.tar.xz"; + sha256 = "03pzic63vi1bmcf4vlk2kfcs6fbc9p0plzydizqmm34iiv8k48jb"; + name = "frameworkintegration-5.13.0.tar.xz"; + }; + }; + kjs = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/portingAids/kjs-5.13.0.tar.xz"; + sha256 = "1ij3f303k1higj5l7l3pxl6qlp8arf3qizbar2d36f3qczyql5r8"; + name = "kjs-5.13.0.tar.xz"; + }; + }; + krunner = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/portingAids/krunner-5.13.0.tar.xz"; + sha256 = "1yj97lp6ny9m45nankgkq7zdw929mw218pq7yalr21vqqxwvd84a"; + name = "krunner-5.13.0.tar.xz"; + }; + }; + khtml = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/portingAids/khtml-5.13.0.tar.xz"; + sha256 = "0mykidqkhs0hd6s4i8li25gk8dzysw6imc2lfjbwvyyvx6lyd55m"; + name = "khtml-5.13.0.tar.xz"; + }; + }; + kmediaplayer = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/portingAids/kmediaplayer-5.13.0.tar.xz"; + sha256 = "19kazkjsc2s1wfcslmi46ic1h7jvwdbbc6y9713jb1yymp6jzz30"; + name = "kmediaplayer-5.13.0.tar.xz"; + }; + }; + kross = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/portingAids/kross-5.13.0.tar.xz"; + sha256 = "18237mj3bzwj4vdxjxqn1b865syi3z3f1zlrnfslijssgw6qs41m"; + name = "kross-5.13.0.tar.xz"; + }; + }; + kjsembed = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/portingAids/kjsembed-5.13.0.tar.xz"; + sha256 = "0inlb47rkfriwnbkkhgb20kc86b38yl9xxwn8cjx80m61sj8ici8"; + name = "kjsembed-5.13.0.tar.xz"; + }; + }; + kdelibs4support = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/portingAids/kdelibs4support-5.13.0.tar.xz"; + sha256 = "1hlniaw259yz6vs42w0q7mjycq1vf8ggvsigc09ij8bj7k7ih3s3"; + name = "kdelibs4support-5.13.0.tar.xz"; + }; + }; + kcrash = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kcrash-5.13.0.tar.xz"; + sha256 = "07cb6jmf1w74ndcfj4mcpc60xkpnl69jzdd5ljxsi2k1awvjs58n"; + name = "kcrash-5.13.0.tar.xz"; + }; + }; + kcmutils = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kcmutils-5.13.0.tar.xz"; + sha256 = "13jc3053jf3lg2zrrqi4mcsnma6xd6p56ilaw86bgvdsq1fkr84b"; + name = "kcmutils-5.13.0.tar.xz"; + }; + }; + knewstuff = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/knewstuff-5.13.0.tar.xz"; + sha256 = "12pyxdb9rq60hcw7k8sh79mq6l5h5zdrixn778yps27ckf69icsr"; + name = "knewstuff-5.13.0.tar.xz"; + }; + }; + kded = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kded-5.13.0.tar.xz"; + sha256 = "0yfpx2dc2x7jzyxmj0k92ar2rvzabz75dwh09rr93wyzyjr1l7i9"; + name = "kded-5.13.0.tar.xz"; + }; + }; + kconfigwidgets = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kconfigwidgets-5.13.0.tar.xz"; + sha256 = "1m5n24c34sdr9hfap2riws0n58pka0a0n23gxdzxwbk9z1fj97zy"; + name = "kconfigwidgets-5.13.0.tar.xz"; + }; + }; + solid = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/solid-5.13.0.tar.xz"; + sha256 = "1s06qbicni2g99kmp7kd06xrps0pqb9d9q04pmmlqdg24fcm0aik"; + name = "solid-5.13.0.tar.xz"; + }; + }; + kjobwidgets = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kjobwidgets-5.13.0.tar.xz"; + sha256 = "0vjqidawgca5zr5vfm55lqnvzr9pk0dp1w85pdpp576rsjg34404"; + name = "kjobwidgets-5.13.0.tar.xz"; + }; + }; + kdesignerplugin = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kdesignerplugin-5.13.0.tar.xz"; + sha256 = "0iibam8d34kyvq0qpbfx1ligwcyp84x4ycr01bydnbc58qz6hg3y"; + name = "kdesignerplugin-5.13.0.tar.xz"; + }; + }; + kglobalaccel = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kglobalaccel-5.13.0.tar.xz"; + sha256 = "1fdfcyb93p39gbkvmzv43hg33vjsr9g2y9vbr07j38q9vgjipynl"; + name = "kglobalaccel-5.13.0.tar.xz"; + }; + }; + attica = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/attica-5.13.0.tar.xz"; + sha256 = "0fxqf8ab8y7lkj0c09zrshwykx2na5yqb3wxlfd8ngd6cyk34r8h"; + name = "attica-5.13.0.tar.xz"; + }; + }; + kdesu = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kdesu-5.13.0.tar.xz"; + sha256 = "0413lddgrwhx3jn2xhmi6gllv4cg2136f00bg0zxdnvgjbavj50g"; + name = "kdesu-5.13.0.tar.xz"; + }; + }; + sonnet = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/sonnet-5.13.0.tar.xz"; + sha256 = "05j79i2aq6cy2crjwsifsfj5kb74ca0bz9yl1302gkdn6qy3lx57"; + name = "sonnet-5.13.0.tar.xz"; + }; + }; + kfilemetadata = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kfilemetadata-5.13.0.tar.xz"; + sha256 = "0c7m1ha1s020jbb5925s859lknq10df1162aal8g99nxvadvkafx"; + name = "kfilemetadata-5.13.0.tar.xz"; + }; + }; + networkmanager-qt = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/networkmanager-qt-5.13.0.tar.xz"; + sha256 = "16v2vr92yfins23h2h6ddlvlf2iasbz67dr8gzyhwa9kcwr23a19"; + name = "networkmanager-qt-5.13.0.tar.xz"; + }; + }; + kbookmarks = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kbookmarks-5.13.0.tar.xz"; + sha256 = "0gmsvhphilv7aqci51hlvaikgpxhbgi6f41qb1ybkjjh6gfcz6lg"; + name = "kbookmarks-5.13.0.tar.xz"; + }; + }; + kpeople = { + version = "5.13.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.13/kpeople-5.13.0.tar.xz"; + sha256 = "1fw9jgkqv1hx5llpkws0v0pcfjjbh7z9b7z474y7ix2ycg9ikxqn"; + name = "kpeople-5.13.0.tar.xz"; + }; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix new file mode 100644 index 00000000000..9c7f76dd051 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix @@ -0,0 +1,11 @@ +{ mkDerivation, lib +, extra-cmake-modules +}: + +mkDerivation { + name = "threadweaver"; + nativeBuildInputs = [ extra-cmake-modules ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aab4f19ff76..ea911ba4630 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6644,6 +6644,7 @@ let kf512 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.12 { }); kf5_latest = kf512; kf5_stable = kf510; + kf513 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.13 { inherit pkgs; }); kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; From a482b9be4a2481333872cf2d2fcb042529d23def Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:03:00 -0500 Subject: [PATCH 11/43] plasma54: init at 5.4.1 --- pkgs/desktops/plasma-5.4/bluedevil.nix | 39 ++ pkgs/desktops/plasma-5.4/breeze-qt4.nix | 29 ++ pkgs/desktops/plasma-5.4/breeze-qt5.nix | 35 ++ pkgs/desktops/plasma-5.4/default.nix | 87 ++++ pkgs/desktops/plasma-5.4/fetchsrcs.sh | 47 ++ pkgs/desktops/plasma-5.4/kde-cli-tools.nix | 41 ++ pkgs/desktops/plasma-5.4/kde-gtk-config.nix | 26 ++ pkgs/desktops/plasma-5.4/kdecoration.nix | 6 + pkgs/desktops/plasma-5.4/kdeplasma-addons.nix | 46 ++ pkgs/desktops/plasma-5.4/kgamma5.nix | 18 + pkgs/desktops/plasma-5.4/khelpcenter.nix | 35 ++ pkgs/desktops/plasma-5.4/khotkeys.nix | 34 ++ pkgs/desktops/plasma-5.4/kinfocenter.nix | 53 +++ pkgs/desktops/plasma-5.4/kmenuedit.nix | 31 ++ pkgs/desktops/plasma-5.4/kscreen.nix | 33 ++ pkgs/desktops/plasma-5.4/ksshaskpass.nix | 25 ++ pkgs/desktops/plasma-5.4/ksysguard.nix | 34 ++ pkgs/desktops/plasma-5.4/kwayland.nix | 14 + pkgs/desktops/plasma-5.4/kwin/default.nix | 85 ++++ .../kwin-import-plugin-follow-symlinks.patch | 13 + .../plasma-5.4/kwin/libinput-0.8.patch | 25 ++ pkgs/desktops/plasma-5.4/kwrited.nix | 22 + .../plasma-5.4/libkscreen/default.nix | 16 + .../libkscreen/libkscreen-backend-path.patch | 130 ++++++ pkgs/desktops/plasma-5.4/libksysguard.nix | 42 ++ pkgs/desktops/plasma-5.4/milou.nix | 28 ++ pkgs/desktops/plasma-5.4/oxygen-fonts.nix | 12 + pkgs/desktops/plasma-5.4/oxygen.nix | 38 ++ .../plasma-desktop/0001-hwclock.patch | 36 ++ .../plasma-desktop/0002-zoneinfo.patch | 30 ++ .../plasma-5.4/plasma-desktop/default.nix | 113 +++++ .../plasma-5.4/plasma-mediacenter.nix | 40 ++ pkgs/desktops/plasma-5.4/plasma-nm.nix | 65 +++ pkgs/desktops/plasma-5.4/plasma-pa.nix | 28 ++ .../plasma-workspace-wallpapers.nix | 10 + .../0001-startkde-NixOS-patches.patch | 404 ++++++++++++++++++ .../plasma-5.4/plasma-workspace/default.nix | 125 ++++++ pkgs/desktops/plasma-5.4/polkit-kde-agent.nix | 32 ++ pkgs/desktops/plasma-5.4/powerdevil.nix | 44 ++ pkgs/desktops/plasma-5.4/setup-hook.sh | 1 + pkgs/desktops/plasma-5.4/srcs.nix | 301 +++++++++++++ pkgs/desktops/plasma-5.4/systemsettings.nix | 39 ++ pkgs/top-level/all-packages.nix | 1 + 43 files changed, 2313 insertions(+) create mode 100644 pkgs/desktops/plasma-5.4/bluedevil.nix create mode 100644 pkgs/desktops/plasma-5.4/breeze-qt4.nix create mode 100644 pkgs/desktops/plasma-5.4/breeze-qt5.nix create mode 100644 pkgs/desktops/plasma-5.4/default.nix create mode 100755 pkgs/desktops/plasma-5.4/fetchsrcs.sh create mode 100644 pkgs/desktops/plasma-5.4/kde-cli-tools.nix create mode 100644 pkgs/desktops/plasma-5.4/kde-gtk-config.nix create mode 100644 pkgs/desktops/plasma-5.4/kdecoration.nix create mode 100644 pkgs/desktops/plasma-5.4/kdeplasma-addons.nix create mode 100644 pkgs/desktops/plasma-5.4/kgamma5.nix create mode 100644 pkgs/desktops/plasma-5.4/khelpcenter.nix create mode 100644 pkgs/desktops/plasma-5.4/khotkeys.nix create mode 100644 pkgs/desktops/plasma-5.4/kinfocenter.nix create mode 100644 pkgs/desktops/plasma-5.4/kmenuedit.nix create mode 100644 pkgs/desktops/plasma-5.4/kscreen.nix create mode 100644 pkgs/desktops/plasma-5.4/ksshaskpass.nix create mode 100644 pkgs/desktops/plasma-5.4/ksysguard.nix create mode 100644 pkgs/desktops/plasma-5.4/kwayland.nix create mode 100644 pkgs/desktops/plasma-5.4/kwin/default.nix create mode 100644 pkgs/desktops/plasma-5.4/kwin/kwin-import-plugin-follow-symlinks.patch create mode 100644 pkgs/desktops/plasma-5.4/kwin/libinput-0.8.patch create mode 100644 pkgs/desktops/plasma-5.4/kwrited.nix create mode 100644 pkgs/desktops/plasma-5.4/libkscreen/default.nix create mode 100644 pkgs/desktops/plasma-5.4/libkscreen/libkscreen-backend-path.patch create mode 100644 pkgs/desktops/plasma-5.4/libksysguard.nix create mode 100644 pkgs/desktops/plasma-5.4/milou.nix create mode 100644 pkgs/desktops/plasma-5.4/oxygen-fonts.nix create mode 100644 pkgs/desktops/plasma-5.4/oxygen.nix create mode 100644 pkgs/desktops/plasma-5.4/plasma-desktop/0001-hwclock.patch create mode 100644 pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch create mode 100644 pkgs/desktops/plasma-5.4/plasma-desktop/default.nix create mode 100644 pkgs/desktops/plasma-5.4/plasma-mediacenter.nix create mode 100644 pkgs/desktops/plasma-5.4/plasma-nm.nix create mode 100644 pkgs/desktops/plasma-5.4/plasma-pa.nix create mode 100644 pkgs/desktops/plasma-5.4/plasma-workspace-wallpapers.nix create mode 100644 pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch create mode 100644 pkgs/desktops/plasma-5.4/plasma-workspace/default.nix create mode 100644 pkgs/desktops/plasma-5.4/polkit-kde-agent.nix create mode 100644 pkgs/desktops/plasma-5.4/powerdevil.nix create mode 100644 pkgs/desktops/plasma-5.4/setup-hook.sh create mode 100644 pkgs/desktops/plasma-5.4/srcs.nix create mode 100644 pkgs/desktops/plasma-5.4/systemsettings.nix diff --git a/pkgs/desktops/plasma-5.4/bluedevil.nix b/pkgs/desktops/plasma-5.4/bluedevil.nix new file mode 100644 index 00000000000..83b0ab64b65 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/bluedevil.nix @@ -0,0 +1,39 @@ +{ mkDerivation +, extra-cmake-modules +, bluez-qt +, kcoreaddons +, kdbusaddons +, kded +, ki18n +, kiconthemes +, kio +, knotifications +, kwidgetsaddons +, kwindowsystem +, plasma-framework +, qtdeclarative +, shared_mime_info +}: + +mkDerivation { + name = "bluedevil"; + nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + buildInputs = [ + bluez-qt + kcoreaddons + kdbusaddons + kded + ki18n + kiconthemes + kio + knotifications + kwidgetsaddons + kwindowsystem + plasma-framework + qtdeclarative + ]; + postInstall = '' + wrapKDEProgram "$out/bin/bluedevil-wizard" + wrapKDEProgram "$out/bin/bluedevil-sendfile" + ''; +} diff --git a/pkgs/desktops/plasma-5.4/breeze-qt4.nix b/pkgs/desktops/plasma-5.4/breeze-qt4.nix new file mode 100644 index 00000000000..c7a11fa0ff1 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/breeze-qt4.nix @@ -0,0 +1,29 @@ +{ mkDerivation +, automoc4 +, cmake +, perl +, pkgconfig +, kdelibs +, qt4 +, xproto +}: + +mkDerivation { + name = "breeze-qt4"; + sname = "breeze"; + buildInputs = [ + kdelibs + qt4 + xproto + ]; + nativeBuildInputs = [ + automoc4 + cmake + perl + pkgconfig + ]; + cmakeFlags = [ + "-DUSE_KDE4=ON" + "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake" + ]; +} diff --git a/pkgs/desktops/plasma-5.4/breeze-qt5.nix b/pkgs/desktops/plasma-5.4/breeze-qt5.nix new file mode 100644 index 00000000000..993f0826dda --- /dev/null +++ b/pkgs/desktops/plasma-5.4/breeze-qt5.nix @@ -0,0 +1,35 @@ +{ mkDerivation +, extra-cmake-modules +, frameworkintegration +, kcmutils +, kconfigwidgets +, kcoreaddons +, kdecoration +, kguiaddons +, ki18n +, kwindowsystem +, qtx11extras +}: + +mkDerivation { + name = "breeze-qt5"; + sname = "breeze"; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + frameworkintegration + kcmutils + kconfigwidgets + kcoreaddons + kdecoration + kguiaddons + ki18n + kwindowsystem + qtx11extras + ]; + cmakeFlags = [ "-DUSE_KDE4=OFF" ]; + postInstall = '' + wrapKDEProgram "$out/bin/breeze-settings5" + ''; +} diff --git a/pkgs/desktops/plasma-5.4/default.nix b/pkgs/desktops/plasma-5.4/default.nix new file mode 100644 index 00000000000..152bc351067 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/default.nix @@ -0,0 +1,87 @@ +# Maintainer's Notes: +# +# How To Update +# 1. Edit the URL in ./manifest.sh +# 2. Run ./manifest.sh +# 3. Fix build errors. + +{ pkgs, debug ? false }: + +let + + inherit (pkgs) lib stdenv symlinkJoin; + + kf5 = pkgs.kf513; + kdeApps = pkgs.kdeApps_15_08; + + srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; + mirror = "mirror://kde"; + + mkDerivation = args: + let + inherit (stdenv) mkDerivation; + inherit (args) name; + sname = args.sname or name; + inherit (srcs."${sname}") src version; + in mkDerivation (args // { + name = "${name}-${version}"; + inherit src; + + setupHook = args.setupHook or ./setup-hook.sh; + + cmakeFlags = + (args.cmakeFlags or []) + ++ [ "-DBUILD_TESTING=OFF" ] + ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; + + meta = { + license = with lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ttuegel ]; + homepage = "http://www.kde.org"; + } // (args.meta or {}); + }); + + addPackages = self: with self; { + bluedevil = callPackage ./bluedevil.nix {}; + breeze-qt4 = callPackage ./breeze-qt4.nix {}; + breeze-qt5 = callPackage ./breeze-qt5.nix {}; + breeze = + let version = (builtins.parseDrvName breeze-qt5.name).version; + in symlinkJoin "breeze-${version}" [ breeze-qt4 breeze-qt5 ]; + kde-cli-tools = callPackage ./kde-cli-tools.nix {}; + kde-gtk-config = callPackage ./kde-gtk-config.nix {}; + kdecoration = callPackage ./kdecoration.nix {}; + kdeplasma-addons = callPackage ./kdeplasma-addons.nix {}; + kgamma5 = callPackage ./kgamma5.nix {}; + khelpcenter = callPackage ./khelpcenter.nix {}; + khotkeys = callPackage ./khotkeys.nix {}; + kinfocenter = callPackage ./kinfocenter.nix {}; + kmenuedit = callPackage ./kmenuedit.nix {}; + kscreen = callPackage ./kscreen.nix {}; + ksshaskpass = callPackage ./ksshaskpass.nix {}; + ksysguard = callPackage ./ksysguard.nix {}; + kwayland = callPackage ./kwayland.nix {}; + kwin = callPackage ./kwin {}; + kwrited = callPackage ./kwrited.nix {}; + libkscreen = callPackage ./libkscreen {}; + libksysguard = callPackage ./libksysguard.nix {}; + milou = callPackage ./milou.nix {}; + oxygen = callPackage ./oxygen.nix {}; + oxygen-fonts = callPackage ./oxygen-fonts.nix {}; + plasma-desktop = callPackage ./plasma-desktop {}; + plasma-mediacenter = callPackage ./plasma-mediacenter.nix {}; + plasma-nm = callPackage ./plasma-nm.nix {}; + plasma-pa = callPackage ./plasma-pa.nix {}; + plasma-workspace = callPackage ./plasma-workspace {}; + plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {}; + polkit-kde-agent = callPackage ./polkit-kde-agent.nix {}; + powerdevil = callPackage ./powerdevil.nix {}; + systemsettings = callPackage ./systemsettings.nix {}; + }; + + newScope = scope: kdeApps.newScope (scope // { inherit mkDerivation; }); + +in lib.makeScope newScope addPackages diff --git a/pkgs/desktops/plasma-5.4/fetchsrcs.sh b/pkgs/desktops/plasma-5.4/fetchsrcs.sh new file mode 100755 index 00000000000..e2c5bdc9d69 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/fetchsrcs.sh @@ -0,0 +1,47 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils findutils gnused nix wget + +set -x + +# The trailing slash at the end is necessary! +RELEASE_URL="http://download.kde.org/stable/plasma/5.4.1/" +EXTRA_WGET_ARGS='-A *.tar.xz' + +mkdir tmp; cd tmp + +wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS + +cat >../srcs.nix <>../srcs.nix <>../srcs.nix + +cd .. diff --git a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix new file mode 100644 index 00000000000..404d86618d9 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix @@ -0,0 +1,41 @@ +{ mkDerivation +, extra-cmake-modules +, kcmutils +, kconfig +, kdelibs4support +, kdesu +, kdoctools +, ki18n +, kiconthemes +, kwindowsystem +, qtsvg +, qtx11extras +}: + +mkDerivation { + name = "kde-cli-tools"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcmutils + kconfig + kdelibs4support + kdesu + ki18n + kiconthemes + kwindowsystem + qtsvg + qtx11extras + ]; + postInstall = '' + wrapKDEProgram "$out/bin/kmimetypefinder5" + wrapKDEProgram "$out/bin/ksvgtopng5" + wrapKDEProgram "$out/bin/ktraderclient5" + wrapKDEProgram "$out/bin/kioclient5" + wrapKDEProgram "$out/bin/kdecp5" + wrapKDEProgram "$out/bin/keditfiletype5" + wrapKDEProgram "$out/bin/kcmshell5" + wrapKDEProgram "$out/bin/kdemv5" + wrapKDEProgram "$out/bin/kstart5" + wrapKDEProgram "$out/bin/kde-open5" + ''; +} diff --git a/pkgs/desktops/plasma-5.4/kde-gtk-config.nix b/pkgs/desktops/plasma-5.4/kde-gtk-config.nix new file mode 100644 index 00000000000..7be329eb016 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/kde-gtk-config.nix @@ -0,0 +1,26 @@ +{ mkDerivation +, extra-cmake-modules +, glib +, gtk2 +, gtk3 +, karchive +, kcmutils +, kconfigwidgets +, ki18n +, kiconthemes +, kio +, knewstuff +}: + +mkDerivation { + name = "kde-gtk-config"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + glib gtk2 gtk3 karchive kcmutils kconfigwidgets ki18n kiconthemes + kio knewstuff + ]; + cmakeFlags = [ + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" + ]; +} diff --git a/pkgs/desktops/plasma-5.4/kdecoration.nix b/pkgs/desktops/plasma-5.4/kdecoration.nix new file mode 100644 index 00000000000..7e2ebb705a7 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/kdecoration.nix @@ -0,0 +1,6 @@ +{ mkDerivation, extra-cmake-modules }: + +mkDerivation { + name = "kdecoration"; + nativeBuildInputs = [ extra-cmake-modules ]; +} diff --git a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix new file mode 100644 index 00000000000..335e5d3298c --- /dev/null +++ b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix @@ -0,0 +1,46 @@ +{ mkDerivation +, extra-cmake-modules +, kdoctools +, ibus +, kconfig +, kconfigwidgets +, kcoreaddons +, kcmutils +, kdelibs4support +, ki18n +, kio +, knewstuff +, kross +, krunner +, kservice +, kunitconversion +, plasma-framework +, qtdeclarative +, qtx11extras +}: + +mkDerivation { + name = "kdeplasma-addons"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + ibus + kconfig + kconfigwidgets + kcoreaddons + kcmutils + kdelibs4support + ki18n + kio + knewstuff + kross + krunner + kservice + kunitconversion + plasma-framework + qtdeclarative + qtx11extras + ]; +} diff --git a/pkgs/desktops/plasma-5.4/kgamma5.nix b/pkgs/desktops/plasma-5.4/kgamma5.nix new file mode 100644 index 00000000000..a82673fc7fa --- /dev/null +++ b/pkgs/desktops/plasma-5.4/kgamma5.nix @@ -0,0 +1,18 @@ +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kdelibs4support +, qtx11extras +}: + +mkDerivation { + name = "kgamma5"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + kdelibs4support + qtx11extras + ]; +} diff --git a/pkgs/desktops/plasma-5.4/khelpcenter.nix b/pkgs/desktops/plasma-5.4/khelpcenter.nix new file mode 100644 index 00000000000..75a713090b7 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/khelpcenter.nix @@ -0,0 +1,35 @@ +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kconfig +, kcoreaddons +, kdbusaddons +, ki18n +, kinit +, kcmutils +, kdelibs4support +, khtml +, kservice +}: + +mkDerivation { + name = "khelpcenter"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + kconfig + kcoreaddons + kdbusaddons + ki18n + kinit + kcmutils + kdelibs4support + khtml + kservice + ]; + postInstall = '' + wrapKDEProgram "$out/bin/khelpcenter" + ''; +} diff --git a/pkgs/desktops/plasma-5.4/khotkeys.nix b/pkgs/desktops/plasma-5.4/khotkeys.nix new file mode 100644 index 00000000000..b1061861495 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/khotkeys.nix @@ -0,0 +1,34 @@ +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kcmutils +, kdbusaddons +, kdelibs4support +, kglobalaccel +, ki18n +, kio +, kxmlgui +, plasma-framework +, plasma-workspace +, qtx11extras +}: + +mkDerivation { + name = "khotkeys"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + kcmutils + kdbusaddons + kdelibs4support + kglobalaccel + ki18n + kio + kxmlgui + plasma-framework + plasma-workspace + qtx11extras + ]; +} diff --git a/pkgs/desktops/plasma-5.4/kinfocenter.nix b/pkgs/desktops/plasma-5.4/kinfocenter.nix new file mode 100644 index 00000000000..0c71ee022da --- /dev/null +++ b/pkgs/desktops/plasma-5.4/kinfocenter.nix @@ -0,0 +1,53 @@ +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kcmutils +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdeclarative +, kdelibs4support +, ki18n +, kiconthemes +, kio +, kpackage +, kservice +, kwidgetsaddons +, kxmlgui +, libraw1394 +, pciutils +, solid +}: + +mkDerivation { + name = "kinfocenter"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + kcmutils + kcompletion + kconfig + kconfigwidgets + kcoreaddons + kdbusaddons + kdeclarative + kdelibs4support + ki18n + kiconthemes + kio + kpackage + kservice + kwidgetsaddons + kxmlgui + libraw1394 + pciutils + solid + ]; + postInstall = '' + wrapKDEProgram "$out/bin/kinfocenter" + ''; +} diff --git a/pkgs/desktops/plasma-5.4/kmenuedit.nix b/pkgs/desktops/plasma-5.4/kmenuedit.nix new file mode 100644 index 00000000000..043ef0407ac --- /dev/null +++ b/pkgs/desktops/plasma-5.4/kmenuedit.nix @@ -0,0 +1,31 @@ +{ mkDerivation +, extra-cmake-modules +, kdoctools +, ki18n +, kxmlgui +, kdbusaddons +, kiconthemes +, kio +, sonnet +, kdelibs4support +}: + +mkDerivation { + name = "kmenuedit"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + ki18n + kxmlgui + kdbusaddons + kiconthemes + kio + sonnet + kdelibs4support + ]; + postInstall = '' + wrapKDEProgram "$out/bin/kmenuedit" + ''; +} diff --git a/pkgs/desktops/plasma-5.4/kscreen.nix b/pkgs/desktops/plasma-5.4/kscreen.nix new file mode 100644 index 00000000000..caf84e96a0a --- /dev/null +++ b/pkgs/desktops/plasma-5.4/kscreen.nix @@ -0,0 +1,33 @@ +{ mkDerivation +, extra-cmake-modules +, kconfig +, kconfigwidgets +, kdbusaddons +, kglobalaccel +, ki18n +, kwidgetsaddons +, kxmlgui +, libkscreen +, qtdeclarative +}: + +mkDerivation { + name = "kscreen"; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + kconfig + kconfigwidgets + kdbusaddons + kglobalaccel + ki18n + kwidgetsaddons + kxmlgui + libkscreen + qtdeclarative + ]; + postInstall = '' + wrapKDEProgram "$out/bin/kscreen-console" + ''; +} diff --git a/pkgs/desktops/plasma-5.4/ksshaskpass.nix b/pkgs/desktops/plasma-5.4/ksshaskpass.nix new file mode 100644 index 00000000000..5593cebabf3 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/ksshaskpass.nix @@ -0,0 +1,25 @@ +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kcoreaddons +, ki18n +, kwallet +, kwidgetsaddons +}: + +mkDerivation { + name = "ksshaskpass"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + kcoreaddons + ki18n + kwallet + kwidgetsaddons + ]; + postInstall = '' + wrapKDEProgram "$out/bin/ksshaskpass" + ''; +} diff --git a/pkgs/desktops/plasma-5.4/ksysguard.nix b/pkgs/desktops/plasma-5.4/ksysguard.nix new file mode 100644 index 00000000000..8e6dc42c77b --- /dev/null +++ b/pkgs/desktops/plasma-5.4/ksysguard.nix @@ -0,0 +1,34 @@ +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kconfig +, kcoreaddons +, kdelibs4support +, ki18n +, kitemviews +, knewstuff +, kiconthemes +, libksysguard +}: + +mkDerivation { + name = "ksysguard"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + kconfig + kcoreaddons + kdelibs4support + ki18n + kitemviews + knewstuff + kiconthemes + libksysguard + ]; + postInstall = '' + wrapKDEProgram "$out/bin/ksysguardd" + wrapKDEProgram "$out/bin/ksysguard" + ''; +} diff --git a/pkgs/desktops/plasma-5.4/kwayland.nix b/pkgs/desktops/plasma-5.4/kwayland.nix new file mode 100644 index 00000000000..bb18e31d3ab --- /dev/null +++ b/pkgs/desktops/plasma-5.4/kwayland.nix @@ -0,0 +1,14 @@ +{ mkDerivation +, extra-cmake-modules +, wayland +}: + +mkDerivation { + name = "kwayland"; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + wayland + ]; +} diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix new file mode 100644 index 00000000000..b4663e3c437 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/kwin/default.nix @@ -0,0 +1,85 @@ +{ mkDerivation +, extra-cmake-modules +, kdoctools +, epoxy +, kactivities +, kcompletion +, kcmutils +, kconfig +, kconfigwidgets +, kcoreaddons +, kcrash +, kdeclarative +, kdecoration +, kglobalaccel +, ki18n +, kiconthemes +, kinit +, kio +, knewstuff +, knotifications +, kpackage +, kservice +, kwayland +, kwidgetsaddons +, kwindowsystem +, kxmlgui +, libinput +, libICE +, libSM +, plasma-framework +, qtdeclarative +, qtscript +, qtx11extras +, udev +, wayland +, xcb-util-cursor +}: + +mkDerivation { + name = "kwin"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + epoxy + kactivities + kcompletion + kcmutils + kconfig + kconfigwidgets + kcoreaddons + kcrash + kdeclarative + kdecoration + kglobalaccel + ki18n + kiconthemes + kinit + kio + knewstuff + knotifications + kpackage + kservice + kwayland + kwidgetsaddons + kwindowsystem + kxmlgui + libinput + libICE + libSM + plasma-framework + qtdeclarative + qtscript + qtx11extras + udev + wayland + xcb-util-cursor + ]; + patches = [ ./kwin-import-plugin-follow-symlinks.patch ]; + postInstall = '' + wrapKDEProgram "$out/bin/kwin_x11" + wrapKDEProgram "$out/bin/kwin_wayland" + ''; +} diff --git a/pkgs/desktops/plasma-5.4/kwin/kwin-import-plugin-follow-symlinks.patch b/pkgs/desktops/plasma-5.4/kwin/kwin-import-plugin-follow-symlinks.patch new file mode 100644 index 00000000000..fd1f35d717e --- /dev/null +++ b/pkgs/desktops/plasma-5.4/kwin/kwin-import-plugin-follow-symlinks.patch @@ -0,0 +1,13 @@ +diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp +index 26b44a9..d14e226 100644 +--- a/clients/aurorae/src/aurorae.cpp ++++ b/clients/aurorae/src/aurorae.cpp +@@ -73,7 +73,7 @@ void AuroraeFactory::init() + // so let's try to locate our plugin: + QString pluginPath; + for (const QString &path : m_engine->importPathList()) { +- QDirIterator it(path, QDirIterator::Subdirectories); ++ QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + it.next(); + QFileInfo fileInfo = it.fileInfo(); diff --git a/pkgs/desktops/plasma-5.4/kwin/libinput-0.8.patch b/pkgs/desktops/plasma-5.4/kwin/libinput-0.8.patch new file mode 100644 index 00000000000..d0b9658b3bf --- /dev/null +++ b/pkgs/desktops/plasma-5.4/kwin/libinput-0.8.patch @@ -0,0 +1,25 @@ +commit a93a2ab1918630c6d571b5a24379c15a0458d1fa +Author: Martin Gräßlin +Date: Wed Jan 28 16:20:57 2015 +0100 + + Disable libinput integration if >= 0.8 is found + + libinput 0.8 is incompatible causing the build to fail. As we are in + dependency freeze the only option is to disable the build. + + BUG: 342893 + FIXED-IN: 5.2.1 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 550ef57..8d9c593 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -145,7 +145,7 @@ set_package_properties(UDev PROPERTIES URL "http://www.freedesktop.org/software + PURPOSE "Required for input handling on Wayland." + ) + set(HAVE_INPUT FALSE) +-if (Libinput_FOUND AND UDEV_FOUND) ++if (Libinput_FOUND AND UDEV_FOUND AND Libinput_VERSION VERSION_LESS 0.8) + set(HAVE_INPUT TRUE) + endif() + diff --git a/pkgs/desktops/plasma-5.4/kwrited.nix b/pkgs/desktops/plasma-5.4/kwrited.nix new file mode 100644 index 00000000000..7ab1de77760 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/kwrited.nix @@ -0,0 +1,22 @@ +{ mkDerivation +, extra-cmake-modules +, kcoreaddons +, ki18n +, kpty +, knotifications +, kdbusaddons +}: + +mkDerivation { + name = "kwrited"; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + kcoreaddons + ki18n + kpty + knotifications + kdbusaddons + ]; +} diff --git a/pkgs/desktops/plasma-5.4/libkscreen/default.nix b/pkgs/desktops/plasma-5.4/libkscreen/default.nix new file mode 100644 index 00000000000..ea6a0b0b0fb --- /dev/null +++ b/pkgs/desktops/plasma-5.4/libkscreen/default.nix @@ -0,0 +1,16 @@ +{ mkDerivation +, extra-cmake-modules +, libXrandr +, qtx11extras +}: + +mkDerivation { + name = "libkscreen"; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + libXrandr + qtx11extras + ]; +} diff --git a/pkgs/desktops/plasma-5.4/libkscreen/libkscreen-backend-path.patch b/pkgs/desktops/plasma-5.4/libkscreen/libkscreen-backend-path.patch new file mode 100644 index 00000000000..d5797924d23 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/libkscreen/libkscreen-backend-path.patch @@ -0,0 +1,130 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 460022f..422a708 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,5 +1,7 @@ + include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES}) + ++configure_file(config-libkscreen.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-libkscreen.h) ++ + set(libkscreen_SRCS + backendloader.cpp + config.cpp +diff --git a/src/backendloader.cpp b/src/backendloader.cpp +index b93e469..8aebc14 100644 +--- a/src/backendloader.cpp ++++ b/src/backendloader.cpp +@@ -16,6 +16,7 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * + *************************************************************************************/ + ++#include "config-libkscreen.h" + #include "backendloader.h" + #include "debug_p.h" + #include "backends/abstractbackend.h" +@@ -40,55 +41,54 @@ bool BackendLoader::init() + const QString backend = qgetenv("KSCREEN_BACKEND").constData(); + const QString backendFilter = QString::fromLatin1("KSC_%1*").arg(backend); + +- const QStringList paths = QCoreApplication::libraryPaths(); +- Q_FOREACH (const QString &path, paths) { +- const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"), +- backendFilter, +- QDir::SortFlags(QDir::QDir::NoSort), +- QDir::NoDotAndDotDot | QDir::Files); +- const QFileInfoList finfos = dir.entryInfoList(); +- Q_FOREACH (const QFileInfo &finfo, finfos) { +- // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND +- if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) { +- continue; +- } ++ QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" PLUGIN_INSTALL_DIR "/"); + +- // When on X11, skip the QScreen backend, instead use the XRandR backend, +- // if not specified in KSCREEN_BACKEND +- if (backend.isEmpty() && +- finfo.fileName().contains(QLatin1String("KSC_QScreen")) && +- QX11Info::isPlatformX11()) { +- continue; +- } ++ const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"), ++ backendFilter, ++ QDir::SortFlags(QDir::QDir::NoSort), ++ QDir::NoDotAndDotDot | QDir::Files); ++ const QFileInfoList finfos = dir.entryInfoList(); ++ Q_FOREACH (const QFileInfo &finfo, finfos) { ++ // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND ++ if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) { ++ continue; ++ } + +- // When not on X11, skip the XRandR backend, and fall back to QSCreen +- // if not specified in KSCREEN_BACKEND +- if (backend.isEmpty() && +- finfo.fileName().contains(QLatin1String("KSC_XRandR")) && +- !QX11Info::isPlatformX11()) { +- continue; +- } ++ // When on X11, skip the QScreen backend, instead use the XRandR backend, ++ // if not specified in KSCREEN_BACKEND ++ if (backend.isEmpty() && ++ finfo.fileName().contains(QLatin1String("KSC_QScreen")) && ++ QX11Info::isPlatformX11()) { ++ continue; ++ } ++ ++ // When not on X11, skip the XRandR backend, and fall back to QSCreen ++ // if not specified in KSCREEN_BACKEND ++ if (backend.isEmpty() && ++ finfo.fileName().contains(QLatin1String("KSC_XRandR")) && ++ !QX11Info::isPlatformX11()) { ++ continue; ++ } + +- QPluginLoader loader(finfo.filePath()); +- loader.load(); +- QObject *instance = loader.instance(); +- if (!instance) { ++ QPluginLoader loader(finfo.filePath()); ++ loader.load(); ++ QObject *instance = loader.instance(); ++ if (!instance) { ++ loader.unload(); ++ continue; ++ } ++ ++ s_backend = qobject_cast< AbstractBackend* >(instance); ++ if (s_backend) { ++ if (!s_backend->isValid()) { ++ qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend"; ++ delete s_backend; ++ s_backend = 0; + loader.unload(); + continue; + } +- +- s_backend = qobject_cast< AbstractBackend* >(instance); +- if (s_backend) { +- if (!s_backend->isValid()) { +- qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend"; +- delete s_backend; +- s_backend = 0; +- loader.unload(); +- continue; +- } +- qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend"; +- return true; +- } ++ qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend"; ++ return true; + } + } + +diff --git a/src/config-libkscreen.h.cmake b/src/config-libkscreen.h.cmake +new file mode 100644 +index 0000000..a99f3d1 +--- /dev/null ++++ b/src/config-libkscreen.h.cmake +@@ -0,0 +1,2 @@ ++#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" ++#define PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}" diff --git a/pkgs/desktops/plasma-5.4/libksysguard.nix b/pkgs/desktops/plasma-5.4/libksysguard.nix new file mode 100644 index 00000000000..ab8a1f3323e --- /dev/null +++ b/pkgs/desktops/plasma-5.4/libksysguard.nix @@ -0,0 +1,42 @@ +{ mkDerivation +, extra-cmake-modules +, kauth +, kcompletion +, kconfigwidgets +, kcoreaddons +, kservice +, kwidgetsaddons +, kwindowsystem +, plasma-framework +, qtscript +, qtwebkit +, qtx11extras +, kconfig +, ki18n +, kiconthemes +}: + +mkDerivation { + name = "libksysguard"; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + kauth + kcompletion + kconfigwidgets + kcoreaddons + kservice + kwidgetsaddons + kwindowsystem + plasma-framework + qtscript + qtwebkit + qtx11extras + ]; + propagatedBuildInputs = [ + kconfig + ki18n + kiconthemes + ]; +} diff --git a/pkgs/desktops/plasma-5.4/milou.nix b/pkgs/desktops/plasma-5.4/milou.nix new file mode 100644 index 00000000000..c9219a1d9f2 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/milou.nix @@ -0,0 +1,28 @@ +{ mkDerivation +, extra-cmake-modules +, qtscript +, qtdeclarative +, kcoreaddons +, ki18n +, kdeclarative +, kservice +, plasma-framework +, krunner +}: + +mkDerivation { + name = "milou"; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + qtscript + qtdeclarative + kcoreaddons + ki18n + kdeclarative + kservice + plasma-framework + krunner + ]; +} diff --git a/pkgs/desktops/plasma-5.4/oxygen-fonts.nix b/pkgs/desktops/plasma-5.4/oxygen-fonts.nix new file mode 100644 index 00000000000..627cc9e420f --- /dev/null +++ b/pkgs/desktops/plasma-5.4/oxygen-fonts.nix @@ -0,0 +1,12 @@ +{ mkDerivation +, extra-cmake-modules +, fontforge +}: + +mkDerivation { + name = "oxygen-fonts"; + nativeBuildInputs = [ + extra-cmake-modules + fontforge + ]; +} diff --git a/pkgs/desktops/plasma-5.4/oxygen.nix b/pkgs/desktops/plasma-5.4/oxygen.nix new file mode 100644 index 00000000000..445cb673f4e --- /dev/null +++ b/pkgs/desktops/plasma-5.4/oxygen.nix @@ -0,0 +1,38 @@ +{ mkDerivation +, extra-cmake-modules +, ki18n +, kcmutils +, kconfig +, kdecoration +, kguiaddons +, kwidgetsaddons +, kservice +, kcompletion +, frameworkintegration +, kwindowsystem +, qtx11extras +}: + +mkDerivation { + name = "oxygen"; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + ki18n + kcmutils + kconfig + kdecoration + kguiaddons + kwidgetsaddons + kservice + kcompletion + frameworkintegration + kwindowsystem + qtx11extras + ]; + postInstall = '' + wrapKDEProgram "$out/bin/oxygen-demo5" + wrapKDEProgram "$out/bin/oxygen-settings5" + ''; +} diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/0001-hwclock.patch b/pkgs/desktops/plasma-5.4/plasma-desktop/0001-hwclock.patch new file mode 100644 index 00000000000..1a0ca99113d --- /dev/null +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/0001-hwclock.patch @@ -0,0 +1,36 @@ +From bce620c9dcb25a4e603b22ead5c004b053dae7bf Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Fri, 28 Aug 2015 10:16:38 -0500 +Subject: [PATCH 1/2] hwclock + +--- + kcms/dateandtime/helper.cpp | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp +index cec5ab8..fc4a6b9 100644 +--- a/kcms/dateandtime/helper.cpp ++++ b/kcms/dateandtime/helper.cpp +@@ -48,10 +48,6 @@ + #include + #endif + +-// We cannot rely on the $PATH environment variable, because D-Bus activation +-// clears it. So we have to use a reasonable default. +-static const QString exePath = QLatin1String("/usr/sbin:/usr/bin:/sbin:/bin"); +- + int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled ) + { + int ret = 0; +@@ -227,7 +223,7 @@ int ClockHelper::tzreset() + + void ClockHelper::toHwclock() + { +- QString hwclock = KStandardDirs::findExe("hwclock", exePath); ++ QString hwclock = "@hwclock@"; + if (!hwclock.isEmpty()) { + KProcess::execute(hwclock, QStringList() << "--systohc"); + } +-- +2.5.0 + diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch b/pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch new file mode 100644 index 00000000000..321bf083ae2 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch @@ -0,0 +1,30 @@ +From 2778186be31a8f949135ed99232eafee201a668d Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Fri, 28 Aug 2015 10:16:53 -0500 +Subject: [PATCH 2/2] zoneinfo + +--- + kcms/dateandtime/helper.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp +index fc4a6b9..7b64d05 100644 +--- a/kcms/dateandtime/helper.cpp ++++ b/kcms/dateandtime/helper.cpp +@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone ) + + val = selectedzone; + #else +- QString tz = "/usr/share/zoneinfo/" + selectedzone; ++ // NixOS-specific path ++ QString tz = "/etc/zoneinfo/" + selectedzone; ++ if (!QFile::exists(tz)) { ++ // Standard Linux path ++ tz = "/usr/share/zoneinfo/" + selectedzone; ++ } + + if (QFile::exists(tz)) { // make sure the new TZ really exists + QFile::remove("/etc/localtime"); +-- +2.5.0 + diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix new file mode 100644 index 00000000000..2051a5060b8 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -0,0 +1,113 @@ +{ mkDerivation +, substituteAll +, extra-cmake-modules +, kdoctools +, attica +, baloo +, boost +, fontconfig +, kactivities +, kauth +, kcmutils +, kdbusaddons +, kdeclarative +, kded +, kdelibs4support +, kemoticons +, kglobalaccel +, ki18n +, kitemmodels +, knewstuff +, knotifications +, knotifyconfig +, kpeople +, krunner +, kwallet +, kwin +, phonon +, plasma-framework +, plasma-workspace +, qtdeclarative +, qtx11extras +, qtsvg +, libXcursor +, libXft +, libxkbfile +, xf86inputevdev +, xf86inputsynaptics +, xinput +, xkeyboard_config +, xorgserver +, libcanberra_kde +, libpulseaudio +, utillinux +}: + +mkDerivation { + name = "plasma-desktop"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + attica + baloo + boost + fontconfig + kactivities + kauth + kcmutils + kdbusaddons + kdeclarative + kded + kdelibs4support + kemoticons + kglobalaccel + ki18n + kitemmodels + knewstuff + knotifications + knotifyconfig + kpeople + krunner + kwallet + kwin + libcanberra_kde + libXcursor + libpulseaudio + libXft + libxkbfile + phonon + plasma-framework + plasma-workspace + qtdeclarative + qtx11extras + qtsvg + xf86inputevdev + xf86inputsynaptics + xkeyboard_config + xinput + ]; + patches = [ + (substituteAll { + src = ./0001-hwclock.patch; + hwclock = "${utillinux}/sbin/hwclock"; + }) + ./0002-zoneinfo.patch + ]; + NIX_CFLAGS_COMPILE = [ "-I${xorgserver}/include/xorg" ]; + cmakeFlags = [ + "-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include/xorg" + "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg" + ]; + postInstall = '' + wrapKDEProgram "$out/bin/kaccess" + wrapKDEProgram "$out/bin/solid-action-desktop-gen" + wrapKDEProgram "$out/bin/knetattach" + wrapKDEProgram "$out/bin/krdb" + wrapKDEProgram "$out/bin/kapplymousetheme" + wrapKDEProgram "$out/bin/kfontinst" + wrapKDEProgram "$out/bin/kcm-touchpad-list-devices" + wrapKDEProgram "$out/bin/kfontview" + ''; +} diff --git a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix new file mode 100644 index 00000000000..6db9ec9289b --- /dev/null +++ b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix @@ -0,0 +1,40 @@ +{ mkDerivation +, extra-cmake-modules +, baloo +, kactivities +, kconfig +, kcoreaddons +, kdeclarative +, kguiaddons +, ki18n +, kio +, kservice +, kfilemetadata +, plasma-framework +, qtdeclarative +, qtmultimedia +, taglib +}: + +mkDerivation { + name = "plasma-mediacenter"; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + baloo + kactivities + kconfig + kcoreaddons + kdeclarative + kguiaddons + ki18n + kio + kservice + kfilemetadata + plasma-framework + qtdeclarative + qtmultimedia + taglib + ]; +} diff --git a/pkgs/desktops/plasma-5.4/plasma-nm.nix b/pkgs/desktops/plasma-5.4/plasma-nm.nix new file mode 100644 index 00000000000..fc0d9b670a4 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/plasma-nm.nix @@ -0,0 +1,65 @@ +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kcompletion +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdeclarative +, kdelibs4support +, ki18n +, kiconthemes +, kinit +, kio +, kitemviews +, knotifications +, kservice +, kwallet +, kwidgetsaddons +, kwindowsystem +, kxmlgui +, mobile_broadband_provider_info +, modemmanager-qt +, networkmanager-qt +, openconnect +, plasma-framework +, qtdeclarative +, solid +}: + +mkDerivation { + name = "plasma-nm"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + kcompletion + kconfigwidgets + kcoreaddons + kdbusaddons + kdeclarative + kdelibs4support + ki18n + kiconthemes + kinit + kio + kitemviews + knotifications + kservice + kwallet + kwidgetsaddons + kwindowsystem + kxmlgui + mobile_broadband_provider_info + modemmanager-qt + networkmanager-qt + openconnect + plasma-framework + qtdeclarative + solid + ]; + postInstall = '' + wrapKDEProgram "$out/bin/kde5-nm-connection-editor" + ''; +} diff --git a/pkgs/desktops/plasma-5.4/plasma-pa.nix b/pkgs/desktops/plasma-5.4/plasma-pa.nix new file mode 100644 index 00000000000..c7fe02952cd --- /dev/null +++ b/pkgs/desktops/plasma-5.4/plasma-pa.nix @@ -0,0 +1,28 @@ +{ mkDerivation +, extra-cmake-modules +, glib +, kconfigwidgets +, kcoreaddons +, kdeclarative +, kglobalaccel +, ki18n +, libpulseaudio +, plasma-framework +}: + +mkDerivation { + name = "plasma-pa"; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + glib + kconfigwidgets + kcoreaddons + kdeclarative + kglobalaccel + ki18n + libpulseaudio + plasma-framework + ]; +} diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5.4/plasma-workspace-wallpapers.nix new file mode 100644 index 00000000000..f3cfd16e299 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/plasma-workspace-wallpapers.nix @@ -0,0 +1,10 @@ +{ mkDerivation +, extra-cmake-modules +}: + +mkDerivation { + name = "plasma-workspace-wallpapers"; + nativeBuildInputs = [ + extra-cmake-modules + ]; +} diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch new file mode 100644 index 00000000000..6752258112e --- /dev/null +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch @@ -0,0 +1,404 @@ +From d34575dc1edb9fcc8e7608e82e63c6c9d20f37ea Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Thu, 27 Aug 2015 20:36:39 -0500 +Subject: [PATCH] startkde NixOS patches + +--- + startkde/startkde.cmake | 219 ++++++++++++++++++++---------------------------- + 1 file changed, 89 insertions(+), 130 deletions(-) + +diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake +index cfbe227..999dd8f 100644 +--- a/startkde/startkde.cmake ++++ b/startkde/startkde.cmake +@@ -1,8 +1,31 @@ +-#!/bin/sh ++#!@bash@/bin/bash + # + # DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ ) + # + ++set -x ++ ++# The KDE icon cache is supposed to update itself ++# automatically, but it uses the timestamp on the icon ++# theme directory as a trigger. Since in Nix the ++# timestamp is always the same, this doesn't work. So as ++# a workaround, nuke the icon cache on login. This isn't ++# perfect, since it may require logging out after ++# installing new applications to update the cache. ++# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html ++rm -fv $HOME/.cache/icon-cache.kcache ++ ++# Qt writes a weird ‘libraryPath’ line to ++# ~/.config/Trolltech.conf that causes the KDE plugin ++# paths of previous KDE invocations to be searched. ++# Obviously using mismatching KDE libraries is potentially ++# disastrous, so here we nuke references to the Nix store ++# in Trolltech.conf. A better solution would be to stop ++# Qt from doing this wackiness in the first place. ++if [ -e $HOME/.config/Trolltech.conf ]; then ++ @gnused@/bin/sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf ++fi ++ + if test "x$1" = x--failsafe; then + KDE_FAILSAFE=1 # General failsafe flag + KWIN_COMPOSE=N # Disable KWin's compositing +@@ -16,29 +39,16 @@ trap 'echo GOT SIGHUP' HUP + # we have to unset this for Darwin since it will screw up KDE's dynamic-loading + unset DYLD_FORCE_FLAT_NAMESPACE + +-# in case we have been started with full pathname spec without being in PATH +-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` +-if [ -n "$bindir" ]; then +- qbindir=`qtpaths --binaries-dir` +- qdbus=$qbindir/qdbus +- case $PATH in +- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; +- *) PATH=$bindir:$PATH; export PATH;; +- esac +-else +- qdbus=qdbus +-fi +- + # Check if a KDE session already is running and whether it's possible to connect to X +-kcheckrunning ++@out@/bin/kcheckrunning + kcheckrunning_result=$? + if test $kcheckrunning_result -eq 0 ; then +- echo "KDE seems to be already running on this display." +- xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null ++ echo "KDE seems to be already running on this display." ++ @xmessage@/bin/xmessage -geometry 500x100 "KDE seems to be already running on this display." + exit 1 + elif test $kcheckrunning_result -eq 2 ; then + echo "\$DISPLAY is not set or cannot connect to the X server." +- exit 1 ++ exit 1 + fi + + # Boot sequence: +@@ -56,13 +66,8 @@ fi + # * Then ksmserver is started which takes control of the rest of the startup sequence + + # We need to create config folder so we can write startupconfigkeys +-if [ ${XDG_CONFIG_HOME} ]; then +- configDir=$XDG_CONFIG_HOME; +-else +- configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html +-fi +- +-mkdir -p $configDir ++configDir=$(@qttools@/bin/qtpaths --writable-path GenericConfigLocation) ++mkdir -p "$configDir" + + #This is basically setting defaults so we can use them with kstartupconfig5 + cat >$configDir/startupconfigkeys </dev/null 2>/dev/null; then ++ : # ok ++else ++ echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 ++ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null ++ @xmessage@/bin/xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" ++ exit 1 ++fi ++ + ksplash_pid= + if test -z "$dl"; then + # the splashscreen and progress indicator + case "$ksplashrc_ksplash_engine" in + KSplashQML) +- ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid` ++ ksplash_pid=`@out@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid` + ;; + None) + ;; +@@ -200,8 +189,7 @@ fi + # For anything else (that doesn't set env vars, or that needs a window manager), + # better use the Autostart folder. + +-# TODO: Use GenericConfigLocation once we depend on Qt 5.4 +-scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` ++scriptpath=$(@qttools@/bin/qtpaths --paths GenericConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g') + + # Add /env/ to the directory to locate the scripts to be sourced + for prefix in `echo $scriptpath`; do +@@ -231,7 +219,7 @@ usr_odir=$HOME/.fonts/kde-override + usr_fdir=$HOME/.fonts + + if test -n "$KDEDIRS"; then +- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` ++ kdedirs_first=`echo "$KDEDIRS" | @gnused@/bin/sed -e 's/:.*//'` + sys_odir=$kdedirs_first/share/fonts/override + sys_fdir=$kdedirs_first/share/fonts + else +@@ -244,23 +232,13 @@ fi + # add the user's dirs to the font path, as they might simply have been made + # read-only by the administrator, for whatever reason. + +-test -d "$sys_odir" && xset +fp "$sys_odir" +-test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir") +-test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir") +-test -d "$sys_fdir" && xset fp+ "$sys_fdir" ++test -d "$sys_odir" && @xset@/bin/xset +fp "$sys_odir" ++test -d "$usr_odir" && ( @mkfontdir@/bin/mkfontdir "$usr_odir" ; @xset@/bin/xset +fp "$usr_odir" ) ++test -d "$usr_fdir" && ( @mkfontdir@/bin/mkfontdir "$usr_fdir" ; @xset@/bin/xset fp+ "$usr_fdir" ) ++test -d "$sys_fdir" && @xset@/bin/xset fp+ "$sys_fdir" + + # Ask X11 to rebuild its font list. +-xset fp rehash +- +-# Set a left cursor instead of the standard X11 "X" cursor, since I've heard +-# from some users that they're confused and don't know what to do. This is +-# especially necessary on slow machines, where starting KDE takes one or two +-# minutes until anything appears on the screen. +-# +-# If the user has overwritten fonts, the cursor font may be different now +-# so don't move this up. +-# +-xsetroot -cursor_name left_ptr ++@xset@/bin/xset fp rehash + + # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap + if test -n "$GS_LIB" ; then +@@ -273,30 +251,6 @@ fi + + echo 'startkde: Starting up...' 1>&2 + +-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. +-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend +-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or +-# /usr/local. +-if test -z "$XDG_DATA_DIRS"; then +- XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share" +-fi +-export XDG_DATA_DIRS +- +-# Make sure that D-Bus is running +-# D-Bus autolaunch is broken +-if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then +- eval `dbus-launch --sh-syntax --exit-with-session` +-fi +-if $qdbus >/dev/null 2>/dev/null; then +- : # ok +-else +- echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 +- test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" +- exit 1 +-fi +- +- + # Mark that full KDE session is running (e.g. Konqueror preloading works only + # with full KDE running). The KDE_FULL_SESSION property can be detected by + # any X client connected to the same X session, even if not launched +@@ -321,11 +275,11 @@ fi + # + KDE_FULL_SESSION=true + export KDE_FULL_SESSION +-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true ++@xprop@/bin/xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true + + KDE_SESSION_VERSION=5 + export KDE_SESSION_VERSION +-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 ++@xprop@/bin/xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 + + KDE_SESSION_UID=`id -ru` + export KDE_SESSION_UID +@@ -335,11 +289,11 @@ export XDG_CURRENT_DESKTOP + + # At this point all the environment is ready, let's send it to kwalletd if running + if test -n "$PAM_KWALLET_LOGIN" ; then +- env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN ++ env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN + fi + # ...and also to kwalletd5 + if test -n "$PAM_KWALLET5_LOGIN" ; then +- env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN ++ env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN + fi + + # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment +@@ -348,21 +302,26 @@ if test $? -ne 0; then + # Startup error + echo 'startkde: Could not sync environment to dbus.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- xmessage -geometry 500x100 "Could not sync environment to dbus." ++ @xmessage@/bin/xmessage -geometry 500x100 "Could not sync environment to dbus." + exit 1 + fi + + # We set LD_BIND_NOW to increase the efficiency of kdeinit. + # kdeinit unsets this variable before loading applications. +-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup ++LD_BIND_NOW=true @kinit@/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup + if test $? -ne 0; then + # Startup error + echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." ++ @xmessage@/bin/xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." + exit 1 + fi + ++# (NixOS) We run kbuildsycoca5 before starting the user session because things ++# may be missing or moved if they have run nixos-rebuild and it may not be ++# possible for them to start Konsole to run it manually! ++@kservice@/bin/kbuildsycoca5 ++ + # finally, give the session control to the session manager + # see kdebase/ksmserver for the description of the rest of the startup sequence + # if the KDEWM environment variable has been set, then it will be used as KDE's +@@ -378,27 +337,27 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" + # lock now and do the rest of the KDE startup underneath the locker. + KSMSERVEROPTIONS="" + test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" +-kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS ++@kinit@/bin/kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS + if test $? -eq 255; then + # Startup error + echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." ++ @xmessage@/bin/xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." + fi + +-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` ++wait_drkonqi=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` + + if test x"$wait_drkonqi"x = x"true"x ; then + # wait for remaining drkonqi instances with timeout (in seconds) +- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` ++ wait_drkonqi_timeout=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` + wait_drkonqi_counter=0 +- while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do ++ while @qttools@/bin/qdbus | @gnugrep@/bin/grep "^[^w]*org.kde.drkonqi" > /dev/null ; do + sleep 5 + wait_drkonqi_counter=$((wait_drkonqi_counter+5)) + if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then + # ask remaining drkonqis to die in a graceful way +- $qdbus | grep 'org.kde.drkonqi-' | while read address ; do +- $qdbus "$address" "/MainApplication" "quit" ++ @qttools@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do ++ @qttools@/bin/qdbus "$address" "/MainApplication" "quit" + done + break + fi +@@ -410,21 +369,21 @@ echo 'startkde: Shutting down...' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null + + # Clean up +-kdeinit5_shutdown ++@kinit@/bin/kdeinit5_shutdown + + echo 'startkde: Running shutdown scripts...' 1>&2 + + # Run scripts found in /plasma-workspace/shutdown + for prefix in `echo "$scriptpath"`; do +- for file in `ls "$prefix"/shutdown 2> /dev/null | egrep -v '(~|\.bak)$'`; do ++ for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do + test -x "$prefix/shutdown/$file" && "$prefix/shutdown/$file" + done + done + + unset KDE_FULL_SESSION +-xprop -root -remove KDE_FULL_SESSION ++@xprop@/bin/xprop -root -remove KDE_FULL_SESSION + unset KDE_SESSION_VERSION +-xprop -root -remove KDE_SESSION_VERSION ++@xprop@/bin/xprop -root -remove KDE_SESSION_VERSION + unset KDE_SESSION_UID + + echo 'startkde: Done.' 1>&2 +-- +2.5.0 + diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix new file mode 100644 index 00000000000..39c77862a76 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -0,0 +1,125 @@ +{ mkDerivation +, extra-cmake-modules +, kdoctools +, baloo +, kactivities +, kcmutils +, kcrash +, kdbusaddons +, kdeclarative +, kdelibs4support +, kdesu +, kdewebkit +, kglobalaccel +, kidletime +, kjsembed +, knewstuff +, knotifyconfig +, kpackage +, krunner +, ktexteditor +, ktextwidgets +, kwallet +, kwayland +, kwin +, kxmlrpcclient +, libdbusmenu +, libkscreen +, libSM +, libXcursor +, networkmanager-qt +, pam +, phonon +, plasma-framework +, qtscript +, qtx11extras +, wayland +, libksysguard +, bash +, coreutils +, gnused +, gnugrep +, socat +, kconfig +, kinit +, kservice +, qttools +, dbus_tools +, mkfontdir +, xmessage +, xprop +, xrdb +, xset +, xsetroot +}: + +mkDerivation { + name = "plasma-workspace"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + baloo + kactivities + kcmutils + kcrash + kdbusaddons + kdeclarative + kdelibs4support + kdesu + kdewebkit + kglobalaccel + kidletime + kjsembed + knewstuff + knotifyconfig + kpackage + krunner + ktexteditor + ktextwidgets + kwallet + kwayland + kwin + kxmlrpcclient + libdbusmenu + libkscreen + libSM + libXcursor + networkmanager-qt + pam + phonon + plasma-framework + qtscript + qtx11extras + wayland + ]; + propagatedBuildInputs = [ + libksysguard + ]; + patches = [ ./0001-startkde-NixOS-patches.patch ]; + + inherit bash coreutils gnused gnugrep socat; + inherit kconfig kinit kservice qttools; + inherit dbus_tools mkfontdir xmessage xprop xrdb xset xsetroot; + postPatch = '' + substituteAllInPlace startkde/startkde.cmake + substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ + --replace kdostartupconfig5 $out/bin/kdostartupconfig5 + ''; + postInstall = '' + wrapKDEProgram "$out/bin/ksmserver" + wrapKDEProgram "$out/bin/plasmawindowed" + wrapKDEProgram "$out/bin/kcminit_startup" + wrapKDEProgram "$out/bin/ksplashqml" + wrapKDEProgram "$out/bin/kcheckrunning" + wrapKDEProgram "$out/bin/systemmonitor" + wrapKDEProgram "$out/bin/kstartupconfig5" + wrapKDEProgram "$out/bin/startplasmacompositor" + wrapKDEProgram "$out/bin/kdostartupconfig5" + wrapKDEProgram "$out/bin/klipper" + wrapKDEProgram "$out/bin/kuiserver5" + wrapKDEProgram "$out/bin/krunner" + wrapKDEProgram "$out/bin/plasmashell" + ''; +} diff --git a/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix b/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix new file mode 100644 index 00000000000..e4075c0776e --- /dev/null +++ b/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix @@ -0,0 +1,32 @@ +{ mkDerivation +, extra-cmake-modules +, ki18n +, kwindowsystem +, kdbusaddons +, kwidgetsaddons +, kcoreaddons +, kcrash +, kconfig +, kiconthemes +, knotifications +, polkitQt +}: + +mkDerivation { + name = "polkit-kde-agent"; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + ki18n + kwindowsystem + kdbusaddons + kwidgetsaddons + kcoreaddons + kcrash + kconfig + kiconthemes + knotifications + polkitQt + ]; +} diff --git a/pkgs/desktops/plasma-5.4/powerdevil.nix b/pkgs/desktops/plasma-5.4/powerdevil.nix new file mode 100644 index 00000000000..b3ce095f5db --- /dev/null +++ b/pkgs/desktops/plasma-5.4/powerdevil.nix @@ -0,0 +1,44 @@ +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kactivities +, kauth +, kconfig +, kdbusaddons +, kdelibs4support +, kglobalaccel +, ki18n +, kidletime +, kio +, knotifyconfig +, libkscreen +, plasma-workspace +, qtx11extras +, solid +, udev +}: + +mkDerivation { + name = "powerdevil"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + kactivities + kauth + kconfig + kdbusaddons + kdelibs4support + kglobalaccel + ki18n + kidletime + kio + knotifyconfig + libkscreen + plasma-workspace + qtx11extras + solid + udev + ]; +} diff --git a/pkgs/desktops/plasma-5.4/setup-hook.sh b/pkgs/desktops/plasma-5.4/setup-hook.sh new file mode 100644 index 00000000000..a8d9b7e0e36 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/setup-hook.sh @@ -0,0 +1 @@ +addToSearchPath XDG_DATA_DIRS @out@/share diff --git a/pkgs/desktops/plasma-5.4/srcs.nix b/pkgs/desktops/plasma-5.4/srcs.nix new file mode 100644 index 00000000000..f9fa3250938 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/srcs.nix @@ -0,0 +1,301 @@ +# DO NOT EDIT! This file is generated automatically by manifest.sh +{ fetchurl, mirror }: + +{ + plasma-nm = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/plasma-nm-5.4.1.tar.xz"; + sha256 = "02rx63ff95nhq2i5hndk93mxixkzf46gp792768i93ss50wjr1li"; + name = "plasma-nm-5.4.1.tar.xz"; + }; + }; + kmenuedit = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/kmenuedit-5.4.1.tar.xz"; + sha256 = "1h0zv6ksfw3ym88y3v5yxwwmw8m9cqbwbrsca0rxa4dc43vinn5m"; + name = "kmenuedit-5.4.1.tar.xz"; + }; + }; + kdecoration = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/kdecoration-5.4.1.tar.xz"; + sha256 = "04jz0b0cx5hwiws5f5d72zd6rr3hqchlbm5qd3xjhq9m8rdb28yv"; + name = "kdecoration-5.4.1.tar.xz"; + }; + }; + user-manager = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/user-manager-5.4.1.tar.xz"; + sha256 = "19srb9dxl1693grjjbqbb4wl1bg7vp50dhsx82mgg09b4vs2szcp"; + name = "user-manager-5.4.1.tar.xz"; + }; + }; + powerdevil = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/powerdevil-5.4.1.tar.xz"; + sha256 = "1l467ijhn7h6b0v5ms8vxpjprd4hjdnhplf0k5k0ynj5cgyk96vh"; + name = "powerdevil-5.4.1.tar.xz"; + }; + }; + libkscreen = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/libkscreen-5.4.1.tar.xz"; + sha256 = "07m340kcajhf0dslcy68msh1zn6gnc58nsxyqasbkikwv9sx4v7r"; + name = "libkscreen-5.4.1.tar.xz"; + }; + }; + kwallet-pam = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/kwallet-pam-5.4.1.tar.xz"; + sha256 = "0y9b2r4cpmj8gidqzc2j9ki09fb76gp1958v2kkbalma9g0689kc"; + name = "kwallet-pam-5.4.1.tar.xz"; + }; + }; + plasma-pa = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/plasma-pa-5.4.1.tar.xz"; + sha256 = "0c0lzhv8fnkb1359n181ys5bwm9pzfw6g4f7pxrx9vlqqhjbr06p"; + name = "plasma-pa-5.4.1.tar.xz"; + }; + }; + ksysguard = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/ksysguard-5.4.1.tar.xz"; + sha256 = "1n9sddx54i6xnr8xk65wbdyl6mpnfmdgzqllc534zj2nq9lgcpfj"; + name = "ksysguard-5.4.1.tar.xz"; + }; + }; + bluedevil = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/bluedevil-5.4.1.tar.xz"; + sha256 = "1sy3v1fq2mw2mjy3xd183g8fpkjwlmz6sp384qzk55nav7clbjfq"; + name = "bluedevil-5.4.1.tar.xz"; + }; + }; + milou = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/milou-5.4.1.tar.xz"; + sha256 = "0n2c94d8kza8m0gl93waa66r52ncn6b0yjbks7lszl0zwzi3wqyx"; + name = "milou-5.4.1.tar.xz"; + }; + }; + plasma-workspace-wallpapers = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/plasma-workspace-wallpapers-5.4.1.tar.xz"; + sha256 = "0p92p3d4m6d8jnbwgfrk8hqij67aa9pvqhzlccn29gr88f1j7wii"; + name = "plasma-workspace-wallpapers-5.4.1.tar.xz"; + }; + }; + kde-cli-tools = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/kde-cli-tools-5.4.1.tar.xz"; + sha256 = "02b6w8hxz05s10ajb4vnasy1ayh8a9skw26asy20zvkm3xn32pc1"; + name = "kde-cli-tools-5.4.1.tar.xz"; + }; + }; + kwin = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/kwin-5.4.1.tar.xz"; + sha256 = "0mx95pwlvx7kfzmp6jcihaw3dmgjjrsizmv5baq8mgravp9zzglw"; + name = "kwin-5.4.1.tar.xz"; + }; + }; + muon = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/muon-5.4.1.tar.xz"; + sha256 = "0g229c2h4k3qdhzhc4sq0vlnwvbmb6qp3d4lix4q65mgnamz4lwc"; + name = "muon-5.4.1.tar.xz"; + }; + }; + oxygen = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/oxygen-5.4.1.tar.xz"; + sha256 = "0a880jm8islbcqp08vwd9srn2kqgrn27lsz7wr0mq2b622hsyk1p"; + name = "oxygen-5.4.1.tar.xz"; + }; + }; + plasma-mediacenter = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/plasma-mediacenter-5.4.1.tar.xz"; + sha256 = "1rnmjhyn83ic77sxybz042ghlzrrfh8ig3ivh9nnshzv8gf58bpx"; + name = "plasma-mediacenter-5.4.1.tar.xz"; + }; + }; + kwrited = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/kwrited-5.4.1.tar.xz"; + sha256 = "0y1ag8syf1g3mmzyr0hci4xcpxs85qh54jzwkj98xghb316akdrs"; + name = "kwrited-5.4.1.tar.xz"; + }; + }; + plasma-sdk = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/plasma-sdk-5.4.1.tar.xz"; + sha256 = "03qazkqi3x5r8bsf7v73qsqnfgv60q12bv2hmg7rf637rbk1ys7s"; + name = "plasma-sdk-5.4.1.tar.xz"; + }; + }; + ksshaskpass = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/ksshaskpass-5.4.1.tar.xz"; + sha256 = "1yjp78p4r5a9ldba5nda8ly8r71zm8niyd0vz262cr14n36l0j52"; + name = "ksshaskpass-5.4.1.tar.xz"; + }; + }; + plasma-desktop = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/plasma-desktop-5.4.1.tar.xz"; + sha256 = "1a3jllmyk12smpf9fczwkkvfp6ljcsy4m271d9wfahl4adwiycjq"; + name = "plasma-desktop-5.4.1.tar.xz"; + }; + }; + sddm-kcm = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/sddm-kcm-5.4.1.tar.xz"; + sha256 = "1vpwn7ybcz5qpx3v2yvhpdcwlicw34gmfy8yi6j199i4kba2c38l"; + name = "sddm-kcm-5.4.1.tar.xz"; + }; + }; + systemsettings = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/systemsettings-5.4.1.tar.xz"; + sha256 = "0nadq4gsv3caz8x237hvphc05zl15fpaanr1m0s2svg84k251k5l"; + name = "systemsettings-5.4.1.tar.xz"; + }; + }; + kwayland-integration = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/kwayland-integration-5.4.1.tar.xz"; + sha256 = "1hcvnbfzzc7rrbi48ar6hjlvj7mhii23lzlbvaizaqv3x8bgpvd7"; + name = "kwayland-integration-5.4.1.tar.xz"; + }; + }; + polkit-kde-agent = { + version = "1-5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/polkit-kde-agent-1-5.4.1.tar.xz"; + sha256 = "1g11kdv9wkqcn4gaijw7j71hkbfg5vi7vci8n880w536l173aa2i"; + name = "polkit-kde-agent-1-5.4.1.tar.xz"; + }; + }; + libksysguard = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/libksysguard-5.4.1.tar.xz"; + sha256 = "03vffsn2bnx26svmm7rpl4rlvnb8kmrqmivqdi55q69fsxdrz1wp"; + name = "libksysguard-5.4.1.tar.xz"; + }; + }; + plasma-workspace = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/plasma-workspace-5.4.1.tar.xz"; + sha256 = "158p70m0dda84c2mskw5xczqr5p8773nb3fibl8h2lw1bn4db130"; + name = "plasma-workspace-5.4.1.tar.xz"; + }; + }; + kgamma5 = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/kgamma5-5.4.1.tar.xz"; + sha256 = "1402cvwl9xjlzqi2z6hx59w388xqhh88igaxz0mwmfnlk6fdvrkv"; + name = "kgamma5-5.4.1.tar.xz"; + }; + }; + kde-gtk-config = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/kde-gtk-config-5.4.1.tar.xz"; + sha256 = "0g86ij6pqlmcjvaw7gc1n7mqf6v6nywsq874nkvja18k9yvr2cc3"; + name = "kde-gtk-config-5.4.1.tar.xz"; + }; + }; + kscreen = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/kscreen-5.4.1.tar.xz"; + sha256 = "00kb1jrdq2hklkq5svjfpmfd4jj8c9mzi5r3kx96hlnwz9abfjcv"; + name = "kscreen-5.4.1.tar.xz"; + }; + }; + kdeplasma-addons = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/kdeplasma-addons-5.4.1.tar.xz"; + sha256 = "0fn5z1p5hs9l0ggi62b0wyqpc4wyaaf49921zjn11nb8qs4y0vg1"; + name = "kdeplasma-addons-5.4.1.tar.xz"; + }; + }; + khotkeys = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/khotkeys-5.4.1.tar.xz"; + sha256 = "07wsf7257b48adn22x7dkws3ifdp9flw51spxk5nqyscs15dljm2"; + name = "khotkeys-5.4.1.tar.xz"; + }; + }; + oxygen-fonts = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/oxygen-fonts-5.4.1.tar.xz"; + sha256 = "0qybgwqz7v37mlqs2gprmxaz5k2dlya3fvcq4kz96zmgrskwlv6v"; + name = "oxygen-fonts-5.4.1.tar.xz"; + }; + }; + breeze = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/breeze-5.4.1.tar.xz"; + sha256 = "0dram0iy3ym4rhxbmv1ssv52avmmqk694b7ja7b9zr7krm1n8gyh"; + name = "breeze-5.4.1.tar.xz"; + }; + }; + kinfocenter = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/kinfocenter-5.4.1.tar.xz"; + sha256 = "17j7akqi3av4b790c40cva2b9vissyzv8kf1mj5b4mxwhrjlhbrj"; + name = "kinfocenter-5.4.1.tar.xz"; + }; + }; + khelpcenter = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/khelpcenter-5.4.1.tar.xz"; + sha256 = "11aszn2ha1wjpdyfr25by963krsmgflqj30fmkns2la1axqq19x9"; + name = "khelpcenter-5.4.1.tar.xz"; + }; + }; + kwayland = { + version = "5.4.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.4.1/kwayland-5.4.1.tar.xz"; + sha256 = "0irw68c9vn4c2jaqll442wr3f6wzj9q2z2qfl5qpq3vb9lpzfafg"; + name = "kwayland-5.4.1.tar.xz"; + }; + }; +} diff --git a/pkgs/desktops/plasma-5.4/systemsettings.nix b/pkgs/desktops/plasma-5.4/systemsettings.nix new file mode 100644 index 00000000000..45821aaf934 --- /dev/null +++ b/pkgs/desktops/plasma-5.4/systemsettings.nix @@ -0,0 +1,39 @@ +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kitemviews +, kcmutils +, ki18n +, kio +, kservice +, kiconthemes +, kwindowsystem +, kxmlgui +, kdbusaddons +, kconfig +, khtml +}: + +mkDerivation { + name = "systemsettings"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + kitemviews + kcmutils + ki18n + kio + kservice + kiconthemes + kwindowsystem + kxmlgui + kdbusaddons + kconfig + khtml + ]; + postInstall = '' + wrapKDEProgram "$out/bin/systemsettings5" + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea911ba4630..bcabace3677 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14132,6 +14132,7 @@ let plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 { }); plasma5_latest = plasma53; plasma5_stable = plasma53; + plasma54 = recurseIntoAttrs (callPackage ../desktops/plasma-5.4 { inherit pkgs; }); kde5 = kf5_stable // plasma5_stable // kdeApps_stable; From dd264938bc1df93a66f7647d9ace267a241a3da7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:03:46 -0500 Subject: [PATCH 12/43] kdeApps_15_08: init at 15.08.1 --- pkgs/applications/kde-apps-15.08/ark.nix | 43 + .../kde-apps-15.08/baloo-widgets.nix | 33 + pkgs/applications/kde-apps-15.08/default.nix | 69 + .../kde-apps-15.08/dolphin-plugins.nix | 29 + pkgs/applications/kde-apps-15.08/dolphin.nix | 63 + pkgs/applications/kde-apps-15.08/fetchsrcs.sh | 47 + .../kde-apps-15.08/ffmpegthumbs.nix | 27 + pkgs/applications/kde-apps-15.08/gpgmepp.nix | 21 + pkgs/applications/kde-apps-15.08/gwenview.nix | 37 + pkgs/applications/kde-apps-15.08/kate.nix | 63 + .../kdegraphics-thumbnailers.nix | 29 + .../0001-old-kde4-cmake-policies.patch | 56 + .../kdelibs/0002-polkit-install-path.patch | 25 + .../kde-apps-15.08/kdelibs/default.nix | 43 + .../kdelibs/polkit-install.patch | 12 + .../kde-apps-15.08/kdelibs/setup-hook.sh | 10 + pkgs/applications/kde-apps-15.08/kgpg.nix | 31 + pkgs/applications/kde-apps-15.08/konsole.nix | 61 + .../applications/kde-apps-15.08/ksnapshot.nix | 29 + .../applications/kde-apps-15.08/libkdcraw.nix | 27 + .../applications/kde-apps-15.08/libkexiv2.nix | 27 + pkgs/applications/kde-apps-15.08/libkipi.nix | 25 + pkgs/applications/kde-apps-15.08/okular.nix | 41 + .../kde-apps-15.08/print-manager.nix | 45 + pkgs/applications/kde-apps-15.08/srcs.nix | 1981 +++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 26 files changed, 2875 insertions(+) create mode 100644 pkgs/applications/kde-apps-15.08/ark.nix create mode 100644 pkgs/applications/kde-apps-15.08/baloo-widgets.nix create mode 100644 pkgs/applications/kde-apps-15.08/default.nix create mode 100644 pkgs/applications/kde-apps-15.08/dolphin-plugins.nix create mode 100644 pkgs/applications/kde-apps-15.08/dolphin.nix create mode 100755 pkgs/applications/kde-apps-15.08/fetchsrcs.sh create mode 100644 pkgs/applications/kde-apps-15.08/ffmpegthumbs.nix create mode 100644 pkgs/applications/kde-apps-15.08/gpgmepp.nix create mode 100644 pkgs/applications/kde-apps-15.08/gwenview.nix create mode 100644 pkgs/applications/kde-apps-15.08/kate.nix create mode 100644 pkgs/applications/kde-apps-15.08/kdegraphics-thumbnailers.nix create mode 100644 pkgs/applications/kde-apps-15.08/kdelibs/0001-old-kde4-cmake-policies.patch create mode 100644 pkgs/applications/kde-apps-15.08/kdelibs/0002-polkit-install-path.patch create mode 100644 pkgs/applications/kde-apps-15.08/kdelibs/default.nix create mode 100644 pkgs/applications/kde-apps-15.08/kdelibs/polkit-install.patch create mode 100644 pkgs/applications/kde-apps-15.08/kdelibs/setup-hook.sh create mode 100644 pkgs/applications/kde-apps-15.08/kgpg.nix create mode 100644 pkgs/applications/kde-apps-15.08/konsole.nix create mode 100644 pkgs/applications/kde-apps-15.08/ksnapshot.nix create mode 100644 pkgs/applications/kde-apps-15.08/libkdcraw.nix create mode 100644 pkgs/applications/kde-apps-15.08/libkexiv2.nix create mode 100644 pkgs/applications/kde-apps-15.08/libkipi.nix create mode 100644 pkgs/applications/kde-apps-15.08/okular.nix create mode 100644 pkgs/applications/kde-apps-15.08/print-manager.nix create mode 100644 pkgs/applications/kde-apps-15.08/srcs.nix diff --git a/pkgs/applications/kde-apps-15.08/ark.nix b/pkgs/applications/kde-apps-15.08/ark.nix new file mode 100644 index 00000000000..2ce3fe7b5ce --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/ark.nix @@ -0,0 +1,43 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, karchive +, kconfig +, kcrash +, kdbusaddons +, ki18n +, kiconthemes +, khtml +, kio +, kservice +, kpty +, kwidgetsaddons +, libarchive +}: + +mkDerivation { + name = "ark"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + karchive + kconfig + kcrash + kdbusaddons + ki18n + kiconthemes + khtml + kio + kservice + kpty + kwidgetsaddons + libarchive + ]; + meta = { + license = with lib.licenses; [ gpl2 lgpl3 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix new file mode 100644 index 00000000000..09695a47e4b --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix @@ -0,0 +1,33 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kconfig +, kio +, ki18n +, kservice +, kfilemetadata +, baloo +, kdelibs4support +}: + +mkDerivation { + name = "baloo-widgets"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + kconfig + kio + ki18n + kservice + kfilemetadata + baloo + kdelibs4support + ]; + meta = { + license = [ lib.licenses.lgpl21 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/default.nix b/pkgs/applications/kde-apps-15.08/default.nix new file mode 100644 index 00000000000..d47dcd11b0b --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/default.nix @@ -0,0 +1,69 @@ +# Maintainer's Notes: +# +# Minor updates: +# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes +# releases updates that include only the changed packages; in this case, +# multiple URLs can be provided and the results will be merged. +# 2. Run ./manifest.sh and ./dependencies.sh. +# 3. Build and enjoy. +# +# Major updates: +# We prefer not to immediately overwrite older versions with major updates, so +# make a copy of this directory first. After copying, be sure to delete ./tmp +# if it exists. Then follow the minor update instructions. + +{ pkgs, debug ? false }: + +let + + inherit (pkgs) lib stdenv; + + srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; + mirror = "mirror://kde"; + + mkDerivation = args: + let + inherit (stdenv) mkDerivation; + inherit (args) name; + sname = args.sname or name; + inherit (srcs."${sname}") src version; + in mkDerivation (args // { + name = "${name}-${version}"; + inherit src; + + cmakeFlags = + (args.cmakeFlags or []) + ++ [ "-DBUILD_TESTING=OFF" ] + ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; + + meta = { + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; + } // (args.meta or {}); + }); + + packages = self: with self; { + kdelibs = callPackage ./kdelibs { inherit (pkgs) attica phonon; }; + + ark = callPackage ./ark.nix {}; + baloo-widgets = callPackage ./baloo-widgets.nix {}; + dolphin = callPackage ./dolphin.nix {}; + dolphin-plugins = callPackage ./dolphin-plugins.nix {}; + ffmpegthumbs = callPackage ./ffmpegthumbs.nix {}; + gpgmepp = callPackage ./gpgmepp.nix {}; + gwenview = callPackage ./gwenview.nix {}; + kate = callPackage ./kate.nix {}; + kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; + kgpg = callPackage ./kgpg.nix { inherit (pkgs.kde4) kdepimlibs; }; + konsole = callPackage ./konsole.nix {}; + ksnapshot = callPackage ./ksnapshot.nix {}; + libkdcraw = callPackage ./libkdcraw.nix {}; + libkexiv2 = callPackage ./libkexiv2.nix {}; + libkipi = callPackage ./libkipi.nix {}; + okular = callPackage ./okular.nix {}; + print-manager = callPackage ./print-manager.nix {}; + }; + + newScope = scope: pkgs.kf513.newScope (scope // { inherit mkDerivation; }); + +in lib.makeScope newScope packages diff --git a/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix b/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix new file mode 100644 index 00000000000..4fe6aab4639 --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix @@ -0,0 +1,29 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kxmlgui +, ki18n +, kio +, kdelibs4support +, dolphin +}: + +mkDerivation { + name = "dolphin-plugins"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + kxmlgui + ki18n + kio + kdelibs4support + dolphin + ]; + meta = { + license = [ lib.licenses.gpl2 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/dolphin.nix b/pkgs/applications/kde-apps-15.08/dolphin.nix new file mode 100644 index 00000000000..f86a1f7ce38 --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/dolphin.nix @@ -0,0 +1,63 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kinit +, kcmutils +, kcoreaddons +, knewstuff +, ki18n +, kdbusaddons +, kbookmarks +, kconfig +, kio +, kparts +, solid +, kiconthemes +, kcompletion +, ktexteditor +, kwindowsystem +, knotifications +, kactivities +, phonon +, baloo +, baloo-widgets +, kfilemetadata +, kdelibs4support +}: + +mkDerivation { + name = "dolphin"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + kinit + kcmutils + kcoreaddons + knewstuff + ki18n + kdbusaddons + kbookmarks + kconfig + kio + kparts + solid + kiconthemes + kcompletion + ktexteditor + kwindowsystem + knotifications + kactivities + phonon + baloo + baloo-widgets + kfilemetadata + kdelibs4support + ]; + meta = { + license = with lib.licenses; [ gpl2 fdl12 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/fetchsrcs.sh b/pkgs/applications/kde-apps-15.08/fetchsrcs.sh new file mode 100755 index 00000000000..e696bb11d93 --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/fetchsrcs.sh @@ -0,0 +1,47 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils findutils gnused nix wget + +set -x + +# The trailing slash at the end is necessary! +RELEASE_URL="http://download.kde.org/stable/applications/15.08.1/" +EXTRA_WGET_ARGS='-A *.tar.xz' + +mkdir tmp; cd tmp + +wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS + +cat >../srcs.nix <>../srcs.nix <>../srcs.nix + +cd .. diff --git a/pkgs/applications/kde-apps-15.08/ffmpegthumbs.nix b/pkgs/applications/kde-apps-15.08/ffmpegthumbs.nix new file mode 100644 index 00000000000..6714db9cb55 --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/ffmpegthumbs.nix @@ -0,0 +1,27 @@ +{ mkDerivation +, lib +, automoc4 +, cmake +, perl +, pkgconfig +, kdelibs +, ffmpeg +}: + +mkDerivation { + name = "ffmpegthumbs"; + nativeBuildInputs = [ + automoc4 + cmake + perl + pkgconfig + ]; + buildInputs = [ + kdelibs + ffmpeg + ]; + meta = { + license = with lib.licenses; [ gpl2 bsd3 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/gpgmepp.nix b/pkgs/applications/kde-apps-15.08/gpgmepp.nix new file mode 100644 index 00000000000..36acf9bd21e --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/gpgmepp.nix @@ -0,0 +1,21 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, boost +, gpgme +}: + +mkDerivation { + name = "gpgmepp"; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + boost + gpgme + ]; + meta = { + license = with lib.licenses; [ lgpl21 bsd3 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/gwenview.nix b/pkgs/applications/kde-apps-15.08/gwenview.nix new file mode 100644 index 00000000000..ed58c8e968a --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/gwenview.nix @@ -0,0 +1,37 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, baloo +, exiv2 +, kactivities +, kdelibs4support +, kio +, lcms2 +, phonon +, qtsvg +, qtx11extras +}: + +mkDerivation { + name = "gwenview"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + baloo + exiv2 + kactivities + kdelibs4support + kio + lcms2 + phonon + qtsvg + qtx11extras + ]; + meta = { + license = with lib.licenses; [ gpl2 fdl12 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/kate.nix b/pkgs/applications/kde-apps-15.08/kate.nix new file mode 100644 index 00000000000..30891baaf17 --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/kate.nix @@ -0,0 +1,63 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, qtscript +, kactivities +, kconfig +, kcrash +, kguiaddons +, kiconthemes +, ki18n +, kinit +, kjobwidgets +, kio +, kparts +, ktexteditor +, kwindowsystem +, kxmlgui +, kdbusaddons +, kwallet +, plasma-framework +, kitemmodels +, knotifications +, threadweaver +, knewstuff +, libgit2 +}: + +mkDerivation { + name = "kate"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + qtscript + kactivities + kconfig + kcrash + kguiaddons + kiconthemes + ki18n + kinit + kjobwidgets + kio + kparts + ktexteditor + kwindowsystem + kxmlgui + kdbusaddons + kwallet + plasma-framework + kitemmodels + knotifications + threadweaver + knewstuff + libgit2 + ]; + meta = { + license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/kdegraphics-thumbnailers.nix b/pkgs/applications/kde-apps-15.08/kdegraphics-thumbnailers.nix new file mode 100644 index 00000000000..b29375b72d7 --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/kdegraphics-thumbnailers.nix @@ -0,0 +1,29 @@ +{ mkDerivation +, lib +, automoc4 +, cmake +, perl +, pkgconfig +, kdelibs +, libkexiv2 +, libkdcraw +}: + +mkDerivation { + name = "kdegraphics-thumbnailers"; + nativeBuildInputs = [ + automoc4 + cmake + perl + pkgconfig + ]; + buildInputs = [ + kdelibs + libkexiv2 + libkdcraw + ]; + meta = { + license = [ lib.licenses.lgpl21 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/kdelibs/0001-old-kde4-cmake-policies.patch b/pkgs/applications/kde-apps-15.08/kdelibs/0001-old-kde4-cmake-policies.patch new file mode 100644 index 00000000000..b7d7300e9a8 --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/kdelibs/0001-old-kde4-cmake-policies.patch @@ -0,0 +1,56 @@ +From b43c49109694940f0a26240753e879eb629dd02d Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 7 Sep 2015 13:54:57 -0500 +Subject: [PATCH 1/2] old kde4 cmake policies + +--- + cmake/modules/FindKDE4Internal.cmake | 33 +++++++++++++++++++++++++++++++++ + 1 file changed, 33 insertions(+) + +diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake +index 7d54b9b..c435571 100644 +--- a/cmake/modules/FindKDE4Internal.cmake ++++ b/cmake/modules/FindKDE4Internal.cmake +@@ -345,6 +345,39 @@ + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + ++# this is required now by cmake 2.6 and so must not be skipped by if(KDE4_FOUND) below ++cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR) ++# set the cmake policies to the 2.4.x compatibility settings (may change for KDE 4.3) ++cmake_policy(VERSION 2.4.5) ++ ++# CMake 2.6, set compatibility behaviour to cmake 2.4 ++# this must be executed always, because the CMAKE_MINIMUM_REQUIRED() command above ++# resets the policy settings, so we get a lot of warnings ++ ++# CMP0000: don't require cmake_minimum_version() directly in the top level CMakeLists.txt, FindKDE4Internal.cmake is good enough ++cmake_policy(SET CMP0000 OLD) ++# CMP0002: in KDE4 we have multiple targets with the same name for the unit tests ++cmake_policy(SET CMP0002 OLD) ++# CMP0003: add the link paths to the link command as with cmake 2.4 ++cmake_policy(SET CMP0003 OLD) ++# CMP0005: keep escaping behaviour for definitions added via add_definitions() ++cmake_policy(SET CMP0005 OLD) ++# since cmake 2.6.3: NEW behaviour is that setting policies doesn't "escape" the file ++# where this is done, macros and functions are executed with the policies as they ++# were when the were defined. Keep the OLD behaviour so we can set the policies here ++# for all KDE software without the big warning ++cmake_policy(SET CMP0011 OLD) ++ ++# since cmake 2.8.4: when include()ing from inside cmake's module dir, prefer the files ++# in this directory over those from CMAKE_MODULE_PATH ++cmake_policy(SET CMP0017 NEW) ++ ++# since cmake 3.0: use of the LOCATION target property is disallowed while it is used in KDE4Macros.cmake ++if (POLICY CMP0026) ++ cmake_policy(SET CMP0026 OLD) ++endif (POLICY CMP0026) ++ ++ + # Only do something if it hasn't been found yet + if(NOT KDE4_FOUND) + +-- +2.5.0 + diff --git a/pkgs/applications/kde-apps-15.08/kdelibs/0002-polkit-install-path.patch b/pkgs/applications/kde-apps-15.08/kdelibs/0002-polkit-install-path.patch new file mode 100644 index 00000000000..ff0306ea148 --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/kdelibs/0002-polkit-install-path.patch @@ -0,0 +1,25 @@ +From fab35bac146a817f3af80f45531355fd70cd226b Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 7 Sep 2015 13:56:03 -0500 +Subject: [PATCH 2/2] polkit install path + +--- + kdecore/auth/ConfigureChecks.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kdecore/auth/ConfigureChecks.cmake b/kdecore/auth/ConfigureChecks.cmake +index 7cf9cb5..c8334ae 100644 +--- a/kdecore/auth/ConfigureChecks.cmake ++++ b/kdecore/auth/ConfigureChecks.cmake +@@ -150,7 +150,7 @@ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT-1") + ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR + ${POLKITQT-1_POLICY_FILES_INSTALL_DIR}) + +- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING ++ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING + "Where policy files generated by KAuth will be installed" FORCE) + elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE") + set (KAUTH_COMPILING_FAKE_BACKEND TRUE) +-- +2.5.0 + diff --git a/pkgs/applications/kde-apps-15.08/kdelibs/default.nix b/pkgs/applications/kde-apps-15.08/kdelibs/default.nix new file mode 100644 index 00000000000..1cdebb5af54 --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/kdelibs/default.nix @@ -0,0 +1,43 @@ +{ mkDerivation, attica, attr, automoc4, avahi, bison, cmake +, docbook_xml_dtd_42, docbook_xsl, flex, giflib, herqq, ilmbase +, libdbusmenu_qt, libjpeg, libxml2, libxslt, perl, phonon, pkgconfig +, polkit_qt4, qca2, qt4, shared_desktop_ontologies, shared_mime_info +, soprano, strigi, udev, xz +, lib +}: + +mkDerivation { + name = "kdelibs"; + + buildInputs = [ + attica attr avahi giflib herqq libdbusmenu_qt libjpeg libxml2 + polkit_qt4 qca2 shared_desktop_ontologies udev xz + ]; + propagatedBuildInputs = [ qt4 soprano phonon strigi ]; + nativeBuildInputs = [ + automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info + ]; + + patches = [ + ./0001-old-kde4-cmake-policies.patch + ./0002-polkit-install-path.patch + ]; + + # cmake does not detect path to `ilmbase` + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + + cmakeFlags = [ + "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" + "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" + "-DHUPNP_ENABLED=ON" + "-DWITH_SOLID_UDISKS2=ON" + "-DKDE_DEFAULT_HOME=.kde" + ]; + + setupHook = ./setup-hook.sh; + + meta = { + licenses = with lib.licenses; [ gpl2 fdl12 lgpl21 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/kdelibs/polkit-install.patch b/pkgs/applications/kde-apps-15.08/kdelibs/polkit-install.patch new file mode 100644 index 00000000000..d2ecac663ec --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/kdelibs/polkit-install.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake +--- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200 ++++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200 +@@ -139,7 +139,7 @@ + ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR + ${POLKITQT-1_POLICY_FILES_INSTALL_DIR}) + +- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING ++ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING + "Where policy files generated by KAuth will be installed" FORCE) + elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE") + set (KAUTH_COMPILING_FAKE_BACKEND TRUE) diff --git a/pkgs/applications/kde-apps-15.08/kdelibs/setup-hook.sh b/pkgs/applications/kde-apps-15.08/kdelibs/setup-hook.sh new file mode 100644 index 00000000000..e0a75dc8acd --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/kdelibs/setup-hook.sh @@ -0,0 +1,10 @@ +addQt4Plugins() { + if [[ -d "$1/lib/qt4/plugins" ]]; then + propagatedUserEnvPkgs+=" $1" + fi + + if [[ -d "$1/lib/kde4/plugins" ]]; then + propagatedUserEnvPkgs+=" $1" + fi +} +envHooks+=(addQt4Plugins) diff --git a/pkgs/applications/kde-apps-15.08/kgpg.nix b/pkgs/applications/kde-apps-15.08/kgpg.nix new file mode 100644 index 00000000000..95b34c3fa8b --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/kgpg.nix @@ -0,0 +1,31 @@ +{ mkDerivation +, lib +, automoc4 +, cmake +, perl +, pkgconfig +, boost +, gpgme +, kdelibs +, kdepimlibs +}: + +mkDerivation { + name = "kgpg"; + nativeBuildInputs = [ + automoc4 + cmake + perl + pkgconfig + ]; + buildInputs = [ + boost + gpgme + kdelibs + kdepimlibs + ]; + meta = { + license = [ lib.licenses.gpl2 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/konsole.nix b/pkgs/applications/kde-apps-15.08/konsole.nix new file mode 100644 index 00000000000..0b8c2c914f2 --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/konsole.nix @@ -0,0 +1,61 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, qtscript +, kbookmarks +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, kguiaddons +, ki18n +, kiconthemes +, kinit +, kdelibs4support +, kio +, knotifications +, knotifyconfig +, kparts +, kpty +, kservice +, ktextwidgets +, kwidgetsaddons +, kwindowsystem +, kxmlgui +}: + +mkDerivation { + name = "konsole"; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + buildInputs = [ + qtscript + kbookmarks + kcompletion + kconfig + kconfigwidgets + kcoreaddons + kguiaddons + ki18n + kiconthemes + kinit + kdelibs4support + kio + knotifications + knotifyconfig + kparts + kpty + kservice + ktextwidgets + kwidgetsaddons + kwindowsystem + kxmlgui + ]; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/ksnapshot.nix b/pkgs/applications/kde-apps-15.08/ksnapshot.nix new file mode 100644 index 00000000000..c9ebb3859ba --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/ksnapshot.nix @@ -0,0 +1,29 @@ +{ mkDerivation +, lib +, automoc4 +, cmake +, perl +, pkgconfig +, kdelibs +, libkipi +, libXfixes +}: + +mkDerivation { + name = "ksnapshot"; + nativeBuildInputs = [ + automoc4 + cmake + perl + pkgconfig + ]; + buildInputs = [ + kdelibs + libkipi + libXfixes + ]; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/libkdcraw.nix b/pkgs/applications/kde-apps-15.08/libkdcraw.nix new file mode 100644 index 00000000000..e29cca4c87c --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/libkdcraw.nix @@ -0,0 +1,27 @@ +{ mkDerivation +, lib +, automoc4 +, cmake +, perl +, pkgconfig +, libraw +, kdelibs +}: + +mkDerivation { + name = "libkdcraw"; + nativeBuildInputs = [ + automoc4 + cmake + perl + pkgconfig + ]; + buildInputs = [ + kdelibs + libraw + ]; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/libkexiv2.nix b/pkgs/applications/kde-apps-15.08/libkexiv2.nix new file mode 100644 index 00000000000..6cfbab9d58b --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/libkexiv2.nix @@ -0,0 +1,27 @@ +{ mkDerivation +, lib +, automoc4 +, cmake +, perl +, pkgconfig +, exiv2 +, kdelibs +}: + +mkDerivation { + name = "libkexiv2"; + nativeBuildInputs = [ + automoc4 + cmake + perl + pkgconfig + ]; + buildInputs = [ + exiv2 + kdelibs + ]; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/libkipi.nix b/pkgs/applications/kde-apps-15.08/libkipi.nix new file mode 100644 index 00000000000..ee24fb82822 --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/libkipi.nix @@ -0,0 +1,25 @@ +{ mkDerivation +, lib +, automoc4 +, cmake +, perl +, pkgconfig +, kdelibs +}: + +mkDerivation { + name = "libkipi"; + nativeBuildInputs = [ + automoc4 + cmake + perl + pkgconfig + ]; + buildInputs = [ + kdelibs + ]; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/okular.nix b/pkgs/applications/kde-apps-15.08/okular.nix new file mode 100644 index 00000000000..0de5183eb78 --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/okular.nix @@ -0,0 +1,41 @@ +{ mkDerivation +, lib +, automoc4 +, cmake +, perl +, pkgconfig +, kdelibs +, qimageblitz +, poppler_qt4 +, libspectre +, libkexiv2 +, djvulibre +, libtiff +, freetype +, ebook_tools +}: + +mkDerivation { + name = "okular"; + nativeBuildInputs = [ + automoc4 + cmake + perl + pkgconfig + ]; + buildInputs = [ + kdelibs + qimageblitz + poppler_qt4 + libspectre + libkexiv2 + djvulibre + libtiff + freetype + ebook_tools + ]; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/print-manager.nix b/pkgs/applications/kde-apps-15.08/print-manager.nix new file mode 100644 index 00000000000..ec8113a1282 --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/print-manager.nix @@ -0,0 +1,45 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, qtdeclarative +, cups +, kconfig +, kconfigwidgets +, kdbusaddons +, kiconthemes +, ki18n +, kcmutils +, kio +, knotifications +, plasma-framework +, kwidgetsaddons +, kwindowsystem +, kitemviews +}: + +mkDerivation { + name = "print-manager"; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + qtdeclarative + cups + kconfig + kconfigwidgets + kdbusaddons + kiconthemes + ki18n + kcmutils + kio + knotifications + plasma-framework + kwidgetsaddons + kwindowsystem + kitemviews + ]; + meta = { + license = [ lib.licenses.gpl2 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/srcs.nix b/pkgs/applications/kde-apps-15.08/srcs.nix new file mode 100644 index 00000000000..97e1e774303 --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/srcs.nix @@ -0,0 +1,1981 @@ +# DO NOT EDIT! This file is generated automatically by manifest.sh +{ fetchurl, mirror }: + +{ + libkcompactdisc = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/libkcompactdisc-15.08.1.tar.xz"; + sha256 = "19b6zjzdmjagz9d9x1bb46cc59r92qm9g0pbvim9br603crwsasd"; + name = "libkcompactdisc-15.08.1.tar.xz"; + }; + }; + kollision = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kollision-15.08.1.tar.xz"; + sha256 = "03bm9ydrfq0kicf7j2bmrvjgcffciq7ys0fz0xpcllkwglidsnar"; + name = "kollision-15.08.1.tar.xz"; + }; + }; + libkmahjongg = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/libkmahjongg-15.08.1.tar.xz"; + sha256 = "1jpcj2kj9wn6988gzz4csrwy4c2pwbnyi184iq6c39fmbvrv4f2r"; + name = "libkmahjongg-15.08.1.tar.xz"; + }; + }; + superkaramba = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/superkaramba-15.08.1.tar.xz"; + sha256 = "0pk7kr2bcj2yasf9af3bdqg207pidkg5m2yafmvp83dz2anyxad9"; + name = "superkaramba-15.08.1.tar.xz"; + }; + }; + kcharselect = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kcharselect-15.08.1.tar.xz"; + sha256 = "0g785ab5iclv1db2dwwlzf14a2l6n9yznw6pb8hx589za7yc46v2"; + name = "kcharselect-15.08.1.tar.xz"; + }; + }; + umbrello = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/umbrello-15.08.1.tar.xz"; + sha256 = "0pq2d4iz1dmxb7cdmcja65703qlsakp590v5yjvhjsnlasnk8anj"; + name = "umbrello-15.08.1.tar.xz"; + }; + }; + kde-runtime = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-runtime-15.08.1.tar.xz"; + sha256 = "04vx2v9m5dz5jihvmqvcd6pvk312hdhgj7pkzv8q0lg3z81fqgyi"; + name = "kde-runtime-15.08.1.tar.xz"; + }; + }; + kcontacts = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kcontacts-15.08.1.tar.xz"; + sha256 = "1a9ww08m3k7sdqnkb2dpi2c0fpfihjschyzwx82kcp1z613agx1c"; + name = "kcontacts-15.08.1.tar.xz"; + }; + }; + kontactinterface = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kontactinterface-15.08.1.tar.xz"; + sha256 = "1axsixl5yvawrczpgfbrcyax9d9mmc8yjvkxi0hi26mq8zzxkxnm"; + name = "kontactinterface-15.08.1.tar.xz"; + }; + }; + ktp-desktop-applets = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ktp-desktop-applets-15.08.1.tar.xz"; + sha256 = "16nan7vb2gzpll2fnc4li23sjjxhgy7ijzfp6zcp5gc1bxn86jj4"; + name = "ktp-desktop-applets-15.08.1.tar.xz"; + }; + }; + kldap = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kldap-15.08.1.tar.xz"; + sha256 = "13mn0zkyd8qkp2rlcd75g821k3xpvwrj6xwjwvllfn25zsng32yw"; + name = "kldap-15.08.1.tar.xz"; + }; + }; + kaccounts-providers = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kaccounts-providers-15.08.1.tar.xz"; + sha256 = "15sl3rwwpshqvzjrkfiray3gg3ja84awsyk3y5n9jbf97rw47v3k"; + name = "kaccounts-providers-15.08.1.tar.xz"; + }; + }; + signon-kwallet-extension = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/signon-kwallet-extension-15.08.1.tar.xz"; + sha256 = "1pb73zqs34kygvaphgrvvl08hj882znsws1nzwbyyskyn6gjsw2n"; + name = "signon-kwallet-extension-15.08.1.tar.xz"; + }; + }; + klines = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/klines-15.08.1.tar.xz"; + sha256 = "17vnbk0qbiynyjycj5nda9w38ija5cvhlfhji1f580hq156qzsgl"; + name = "klines-15.08.1.tar.xz"; + }; + }; + kompare = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kompare-15.08.1.tar.xz"; + sha256 = "0n474f1nvbkxj1ryyv2x0yqm9qg3crdzmr30l2fbagi2fxmjxkli"; + name = "kompare-15.08.1.tar.xz"; + }; + }; + analitza = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/analitza-15.08.1.tar.xz"; + sha256 = "0zxkpsccnp0m8r7z1p243h5vh4fz4dzq2dz932vfac8hs45lcaki"; + name = "analitza-15.08.1.tar.xz"; + }; + }; + kalzium = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kalzium-15.08.1.tar.xz"; + sha256 = "0jhfv5cw5vhgy13ld5km664r7ydqv52nwd4k450x2d62rvq63nfp"; + name = "kalzium-15.08.1.tar.xz"; + }; + }; + kcachegrind = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kcachegrind-15.08.1.tar.xz"; + sha256 = "1nmyw0nld1qasd2zz8dg854br8nqn3kby2xd2afr9a8frhzzmiv2"; + name = "kcachegrind-15.08.1.tar.xz"; + }; + }; + kuser = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kuser-15.08.1.tar.xz"; + sha256 = "0qgvjfh1r4ri227zbcb2v9dg7njg1wq3pi189y0l3jzgfa4h1aph"; + name = "kuser-15.08.1.tar.xz"; + }; + }; + libkgeomap = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/libkgeomap-15.08.1.tar.xz"; + sha256 = "18y3pas4bx16ykf50jlwry7fbrx34cz1s0qflirxyrx6n8kh9lgm"; + name = "libkgeomap-15.08.1.tar.xz"; + }; + }; + artikulate = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/artikulate-15.08.1.tar.xz"; + sha256 = "0pz66hrnd89519ivk1cw8gzddjv6043x59nbkhmnlk8f5hvvkk2k"; + name = "artikulate-15.08.1.tar.xz"; + }; + }; + kscd = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kscd-15.08.1.tar.xz"; + sha256 = "0alf1088p32spwlpjjj91wpgk48ahzqphvag8adgvh9cp8ij7m7j"; + name = "kscd-15.08.1.tar.xz"; + }; + }; + akonadi-calendar = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/akonadi-calendar-15.08.1.tar.xz"; + sha256 = "00iyv123s18157v46y3xdg56lyfr0w6f0zz8qsp6js7vn0fa468j"; + name = "akonadi-calendar-15.08.1.tar.xz"; + }; + }; + kdesdk-strigi-analyzers = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kdesdk-strigi-analyzers-15.08.1.tar.xz"; + sha256 = "1g2c511ba42mxg955yyh8w45ga5313mvvpkdl7yvbz7ikb2z6ji5"; + name = "kdesdk-strigi-analyzers-15.08.1.tar.xz"; + }; + }; + killbots = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/killbots-15.08.1.tar.xz"; + sha256 = "1p7lxi3rh8ghashy04252wc086kxz1crdxgnisfw4dv4kr17qmb2"; + name = "killbots-15.08.1.tar.xz"; + }; + }; + ksirk = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ksirk-15.08.1.tar.xz"; + sha256 = "00zlmjyxf31hl910kickgxcc3sh5g2j9grg2mlps8qxdv9m4g1d5"; + name = "ksirk-15.08.1.tar.xz"; + }; + }; + ark = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ark-15.08.1.tar.xz"; + sha256 = "0lmqi9qdf46v9yap6f7s5favx4y66w3sixhplby4q1cm085yg5hl"; + name = "ark-15.08.1.tar.xz"; + }; + }; + kde-l10n-el = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-el-15.08.1.tar.xz"; + sha256 = "0qznnbk6mgbdjz4mm7rpmr04b6i9fya1yjhnmv8hpwlicl8n9sd6"; + name = "kde-l10n-el-15.08.1.tar.xz"; + }; + }; + kde-l10n-ug = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ug-15.08.1.tar.xz"; + sha256 = "1brnbjnpwqhh52g058s2hqh77a6p2c81sygdfsjgngc0griahl4q"; + name = "kde-l10n-ug-15.08.1.tar.xz"; + }; + }; + kde-l10n-sl = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-sl-15.08.1.tar.xz"; + sha256 = "12gg889lhq6l1h5bv6hlcwsq2zkqdfxgicxhkjnm3i7ly5laij4f"; + name = "kde-l10n-sl-15.08.1.tar.xz"; + }; + }; + kde-l10n-ar = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ar-15.08.1.tar.xz"; + sha256 = "101c1316wwxl3pf38fb9ch2h5nyra8h2cf79w9l1krdcp6s4776w"; + name = "kde-l10n-ar-15.08.1.tar.xz"; + }; + }; + kde-l10n-wa = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-wa-15.08.1.tar.xz"; + sha256 = "0z9s118fc0wj2dg2ha7mv0rldvsa3rr8mhwjdgawkmfr9ns82w64"; + name = "kde-l10n-wa-15.08.1.tar.xz"; + }; + }; + kde-l10n-ro = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ro-15.08.1.tar.xz"; + sha256 = "0j3qccfwarb9azsvm2pf0ikc12dsbywzfi7hv2xd244qcnjpp289"; + name = "kde-l10n-ro-15.08.1.tar.xz"; + }; + }; + kde-l10n-it = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-it-15.08.1.tar.xz"; + sha256 = "04blm19llvm2n885p9in4iicaj81ap9vvxsqmfnz7rwb93bsy4wl"; + name = "kde-l10n-it-15.08.1.tar.xz"; + }; + }; + kde-l10n-he = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-he-15.08.1.tar.xz"; + sha256 = "1fgxnm6l45kcjrgjg19z2fg6fnsbpdy0agllj6rw0ffbcp68l863"; + name = "kde-l10n-he-15.08.1.tar.xz"; + }; + }; + kde-l10n-et = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-et-15.08.1.tar.xz"; + sha256 = "027vpybfrm6zdmglwlhmyrh6157gmv8i5x1hx5d8f57m8jnh3nfq"; + name = "kde-l10n-et-15.08.1.tar.xz"; + }; + }; + kde-l10n-pa = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-pa-15.08.1.tar.xz"; + sha256 = "05n9kaalsdx8nvn0p29wf33barhkhb64xxr3xg8cc0d3x21kmhx1"; + name = "kde-l10n-pa-15.08.1.tar.xz"; + }; + }; + kde-l10n-ja = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ja-15.08.1.tar.xz"; + sha256 = "0ir82yc2jmy7ijn02y9f2vxnv1cd5a92pjji3fzriqfg6dlgyiw9"; + name = "kde-l10n-ja-15.08.1.tar.xz"; + }; + }; + kde-l10n-bg = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-bg-15.08.1.tar.xz"; + sha256 = "1r515r3c03328ivwqkm7ijj2264l21liblzllgvjy6zmg7n8ilsp"; + name = "kde-l10n-bg-15.08.1.tar.xz"; + }; + }; + kde-l10n-ko = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ko-15.08.1.tar.xz"; + sha256 = "19w7z4j7463lg0yzkf8ndfvf3664hk524qfcrdygf61f03hkp22l"; + name = "kde-l10n-ko-15.08.1.tar.xz"; + }; + }; + kde-l10n-tr = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-tr-15.08.1.tar.xz"; + sha256 = "1bca3scdg4ma6k6957pq45dmjxgp8hx3bm9jql2rqp0knqf9dwl8"; + name = "kde-l10n-tr-15.08.1.tar.xz"; + }; + }; + kde-l10n-mr = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-mr-15.08.1.tar.xz"; + sha256 = "0ga55szsi9kbvjdcc2cjl8m15jzcfrpiryak1m78s46p056lfs7n"; + name = "kde-l10n-mr-15.08.1.tar.xz"; + }; + }; + kde-l10n-es = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-es-15.08.1.tar.xz"; + sha256 = "1bb1vp8k6f323q2rjclxpja9yykfgm2di6wn0qhr787swr6qrxjb"; + name = "kde-l10n-es-15.08.1.tar.xz"; + }; + }; + kde-l10n-hu = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-hu-15.08.1.tar.xz"; + sha256 = "0jysfqb9pmhcw2kd48n6asmkci56mgk1jcsx8gxn9lcfrqnpc52g"; + name = "kde-l10n-hu-15.08.1.tar.xz"; + }; + }; + kde-l10n-km = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-km-15.08.1.tar.xz"; + sha256 = "1yjckfma9dj8li9whwfa6bid289z05vllxqigbsjfy12721ahrc6"; + name = "kde-l10n-km-15.08.1.tar.xz"; + }; + }; + kde-l10n-eo = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-eo-15.08.1.tar.xz"; + sha256 = "07rns0a5bb2sq13hcndvq79zg451lc3rj2cldmdxdyj5axl0c955"; + name = "kde-l10n-eo-15.08.1.tar.xz"; + }; + }; + kde-l10n-pt = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-pt-15.08.1.tar.xz"; + sha256 = "0z5lginm78i6wrxhcdarv660sszybjih02ra3j4wghflzhwrgrhw"; + name = "kde-l10n-pt-15.08.1.tar.xz"; + }; + }; + kde-l10n-pl = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-pl-15.08.1.tar.xz"; + sha256 = "0ifjvbvzm5qks35z54i5mdz151347690zg4rn8y033lag81c7ir1"; + name = "kde-l10n-pl-15.08.1.tar.xz"; + }; + }; + kde-l10n-lv = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-lv-15.08.1.tar.xz"; + sha256 = "105lq8q97dg9y9j5p5zqf78gvk28qn4axr3ppk1j698576l1ihxl"; + name = "kde-l10n-lv-15.08.1.tar.xz"; + }; + }; + kde-l10n-en_GB = { + version = "en_GB-15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-en_GB-15.08.1.tar.xz"; + sha256 = "0rb4pjxds75x84ylc71ci2sj75l5p8vr2hmnrlddmj39j22c3mcj"; + name = "kde-l10n-en_GB-15.08.1.tar.xz"; + }; + }; + kde-l10n-nn = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-nn-15.08.1.tar.xz"; + sha256 = "01h9xysa8vghaghqpfp7gvps3rymiypb52ffz50srhrhjyh1zq0y"; + name = "kde-l10n-nn-15.08.1.tar.xz"; + }; + }; + kde-l10n-hr = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-hr-15.08.1.tar.xz"; + sha256 = "0jlnig5rsmdxv3ng352hd8n0vqd020bf00xnjbdihcnvdwq625lv"; + name = "kde-l10n-hr-15.08.1.tar.xz"; + }; + }; + kde-l10n-fi = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-fi-15.08.1.tar.xz"; + sha256 = "0ajgy01p22h1c2dsarsq7ximwp3blvmxnf9217szikkf5yky2w9m"; + name = "kde-l10n-fi-15.08.1.tar.xz"; + }; + }; + kde-l10n-ia = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ia-15.08.1.tar.xz"; + sha256 = "1mgzpzy1s45v6nf2wbqgsam7bdg1x0fkmggnwy8k8f7kx5yxfcw4"; + name = "kde-l10n-ia-15.08.1.tar.xz"; + }; + }; + kde-l10n-ga = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ga-15.08.1.tar.xz"; + sha256 = "06l39s9d6y33f4vvcxvry7cxw2m431xgvcz1wcmf6zhlpi5wwlmr"; + name = "kde-l10n-ga-15.08.1.tar.xz"; + }; + }; + kde-l10n-ca = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ca-15.08.1.tar.xz"; + sha256 = "0ql4b550wasf31vkvha1kjyv7d0svyxk7wc77v39fbly0agxwbap"; + name = "kde-l10n-ca-15.08.1.tar.xz"; + }; + }; + kde-l10n-de = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-de-15.08.1.tar.xz"; + sha256 = "11ayw3n392qz1dyblw4gsw4pbdp3wll11z76cawhbmj2jscjd1yb"; + name = "kde-l10n-de-15.08.1.tar.xz"; + }; + }; + kde-l10n-fr = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-fr-15.08.1.tar.xz"; + sha256 = "1mclsk410ir9y6xvy8j8dswpa3k7hmjng232annq05fzapw7bda6"; + name = "kde-l10n-fr-15.08.1.tar.xz"; + }; + }; + kde-l10n-id = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-id-15.08.1.tar.xz"; + sha256 = "13lls8w18c8zrfrqfaz2yjn7jcjrv6dsax09l8wda5144xhbsxw3"; + name = "kde-l10n-id-15.08.1.tar.xz"; + }; + }; + kde-l10n-ca_valencia = { + version = "ca_valencia-15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ca@valencia-15.08.1.tar.xz"; + sha256 = "075j5zbn9fy510bf278j3184niwf8dkdpzihvjsram8xrggl4whl"; + name = "kde-l10n-ca_valencia-15.08.1.tar.xz"; + }; + }; + kde-l10n-nds = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-nds-15.08.1.tar.xz"; + sha256 = "0ifndqj0d58g6k71qw9n4xhd0a90fqba3xsk2qyd6yhnmygd48xd"; + name = "kde-l10n-nds-15.08.1.tar.xz"; + }; + }; + kde-l10n-nl = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-nl-15.08.1.tar.xz"; + sha256 = "11jzaf5dbyl52s61031lygn8xf6qjjqaldlyqgljz1scpp13f75b"; + name = "kde-l10n-nl-15.08.1.tar.xz"; + }; + }; + kde-l10n-fa = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-fa-15.08.1.tar.xz"; + sha256 = "1bai66j03khb6f6y8v72axan6aggdlbwgv3bi91mxwlzhy8ycjxx"; + name = "kde-l10n-fa-15.08.1.tar.xz"; + }; + }; + kde-l10n-da = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-da-15.08.1.tar.xz"; + sha256 = "10sxs45bvs5qw02pj2qhykymm3ddl6ij3gvwgxj7r1kl84lfkil6"; + name = "kde-l10n-da-15.08.1.tar.xz"; + }; + }; + kde-l10n-uk = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-uk-15.08.1.tar.xz"; + sha256 = "00f6mjs7nalg8q87ix7h66kqicy7xb9pgkghldbhpal0rqgzscph"; + name = "kde-l10n-uk-15.08.1.tar.xz"; + }; + }; + kde-l10n-eu = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-eu-15.08.1.tar.xz"; + sha256 = "01jcykc8d7nzlsfjp2xcbf7bkld7skf7mmrig7dllgl0igdkx1qm"; + name = "kde-l10n-eu-15.08.1.tar.xz"; + }; + }; + kde-l10n-sk = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-sk-15.08.1.tar.xz"; + sha256 = "13fcfrsdn0q7z0p2cxkcl54g597ix17327lyxz0ns4xn9ada198s"; + name = "kde-l10n-sk-15.08.1.tar.xz"; + }; + }; + kde-l10n-kk = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-kk-15.08.1.tar.xz"; + sha256 = "13zi7yh9hsxmb8v6x2jqlyh4wdb4waj653py27g91rbznsp1fjzp"; + name = "kde-l10n-kk-15.08.1.tar.xz"; + }; + }; + kde-l10n-zh_CN = { + version = "zh_CN-15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-zh_CN-15.08.1.tar.xz"; + sha256 = "0j88zjxihddgi4a53034i5br3jf8v61wp5mcbclci59i4p4cwrh7"; + name = "kde-l10n-zh_CN-15.08.1.tar.xz"; + }; + }; + kde-l10n-lt = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-lt-15.08.1.tar.xz"; + sha256 = "03g7l9yyw6wajjpkqss16kfyg6piv50xjrzdy8611asdfabhccjs"; + name = "kde-l10n-lt-15.08.1.tar.xz"; + }; + }; + kde-l10n-sv = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-sv-15.08.1.tar.xz"; + sha256 = "0dvgqf39xiz1fkfxvfn9232j454377d92c72dd0h3yl7mf9nndd7"; + name = "kde-l10n-sv-15.08.1.tar.xz"; + }; + }; + kde-l10n-nb = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-nb-15.08.1.tar.xz"; + sha256 = "1y51kdmgnirfjsc5ka75rjvbqjbxxchqj2j4430h8jncjgvjvw6d"; + name = "kde-l10n-nb-15.08.1.tar.xz"; + }; + }; + kde-l10n-gl = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-gl-15.08.1.tar.xz"; + sha256 = "0fapj4gmm4pp5bf3gj6xwnzjxw9094mal7njb0nisshvdfbpgr37"; + name = "kde-l10n-gl-15.08.1.tar.xz"; + }; + }; + kde-l10n-hi = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-hi-15.08.1.tar.xz"; + sha256 = "0ys05gxcj6vkx4a8xjhwfym6faz6ifh50i5si175rynb6igyydnh"; + name = "kde-l10n-hi-15.08.1.tar.xz"; + }; + }; + kde-l10n-ru = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ru-15.08.1.tar.xz"; + sha256 = "1qdgh3y8q7hnkhjfbid35fxy4xjl1hj800kljhif7q4kg4ish86m"; + name = "kde-l10n-ru-15.08.1.tar.xz"; + }; + }; + kde-l10n-sr = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-sr-15.08.1.tar.xz"; + sha256 = "1ag5fj3iy5kycwgwhxiwcp4xl19j1q1lbk07b6nz69jm12kpsy6i"; + name = "kde-l10n-sr-15.08.1.tar.xz"; + }; + }; + kde-l10n-cs = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-cs-15.08.1.tar.xz"; + sha256 = "1lmln0q9r7cvkvs0qz2ky01rj8rjbrwl7g3vkz2zyr64gxgnjilz"; + name = "kde-l10n-cs-15.08.1.tar.xz"; + }; + }; + kde-l10n-bs = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-bs-15.08.1.tar.xz"; + sha256 = "0wyk547g8k3j6lcl1wipw4jwd0wqi8zrnb2h59g55il9rj7782q3"; + name = "kde-l10n-bs-15.08.1.tar.xz"; + }; + }; + kde-l10n-is = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-is-15.08.1.tar.xz"; + sha256 = "0n3ws9imns4jzvnnrkrm8dk8yzlfjcbxl7ip36m7a09lnnskc4zw"; + name = "kde-l10n-is-15.08.1.tar.xz"; + }; + }; + kde-l10n-zh_TW = { + version = "zh_TW-15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-zh_TW-15.08.1.tar.xz"; + sha256 = "1w4f8wr9c132z4kmqcjknrgp1hh33s08qvyjxysns6ncj6izpaaz"; + name = "kde-l10n-zh_TW-15.08.1.tar.xz"; + }; + }; + kde-l10n-pt_BR = { + version = "pt_BR-15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-pt_BR-15.08.1.tar.xz"; + sha256 = "0dr0h5bxw462mpirzsnvxcy3s14nlk3a2gh5h9r2wis5fii364da"; + name = "kde-l10n-pt_BR-15.08.1.tar.xz"; + }; + }; + kmix = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kmix-15.08.1.tar.xz"; + sha256 = "1lpzghasljw07kq9a94lw61l4qlvhif6cd7jypg0vici65lz8k7d"; + name = "kmix-15.08.1.tar.xz"; + }; + }; + kjumpingcube = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kjumpingcube-15.08.1.tar.xz"; + sha256 = "1b0mqf9rhbdz4dfd0gbps59zzjqdif30zz642v4yi6mqnc002yv9"; + name = "kjumpingcube-15.08.1.tar.xz"; + }; + }; + kruler = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kruler-15.08.1.tar.xz"; + sha256 = "06qlvdyd1cbw8vr2qcqs7q8jylj7kl0y218agp8b60h03nri9psj"; + name = "kruler-15.08.1.tar.xz"; + }; + }; + poxml = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/poxml-15.08.1.tar.xz"; + sha256 = "076ksfa9pdjbs8xk38j5z1ysryqcq68fgk5zw157cmxjaxv4ahqm"; + name = "poxml-15.08.1.tar.xz"; + }; + }; + knavalbattle = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/knavalbattle-15.08.1.tar.xz"; + sha256 = "1j235kdnb0qx1dkq89gqcwk0qjj16m0iyf502d6p1mz8cskz7fkp"; + name = "knavalbattle-15.08.1.tar.xz"; + }; + }; + libkexiv2 = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/libkexiv2-15.08.1.tar.xz"; + sha256 = "0cgbh6g5kqi8lzlnidd19yxlyzid71pncpxikmhqfmnwhdgrqq2f"; + name = "libkexiv2-15.08.1.tar.xz"; + }; + }; + kcalutils = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kcalutils-15.08.1.tar.xz"; + sha256 = "0l8kzz092wz93j58h52q4icpvhvl2djgagdbx12yl7qlwin7wnd3"; + name = "kcalutils-15.08.1.tar.xz"; + }; + }; + palapeli = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/palapeli-15.08.1.tar.xz"; + sha256 = "09sbyw25ngvcg6inhh7ig0x5yyhsi3gw2il1p98sfdabjk2f8736"; + name = "palapeli-15.08.1.tar.xz"; + }; + }; + ksudoku = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ksudoku-15.08.1.tar.xz"; + sha256 = "1l6dgackab9k1rnzbwwz3rfpxlqvydp5q632ibpqs449c6pk3kww"; + name = "ksudoku-15.08.1.tar.xz"; + }; + }; + kdebugsettings = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kdebugsettings-15.08.1.tar.xz"; + sha256 = "1h5wn6ilhkrygjacb592nmdv31791y9r0rx6m3l7xx3nbj9hy12c"; + name = "kdebugsettings-15.08.1.tar.xz"; + }; + }; + kdegraphics-strigi-analyzer = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kdegraphics-strigi-analyzer-15.08.1.tar.xz"; + sha256 = "12yby24k5crsyz6mhm2r0wnl306gp7422yj1nrl6yqi16wd37rbs"; + name = "kdegraphics-strigi-analyzer-15.08.1.tar.xz"; + }; + }; + kturtle = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kturtle-15.08.1.tar.xz"; + sha256 = "0n6vbj2kvcby62cn8i65dq2rl5jv1zfp9xbg827s6vz681an2sqk"; + name = "kturtle-15.08.1.tar.xz"; + }; + }; + libkcddb = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/libkcddb-15.08.1.tar.xz"; + sha256 = "1x26dpr26d6xc73203dbk3vni7hcn1w6jdk94ffs0aaf3bmifal2"; + name = "libkcddb-15.08.1.tar.xz"; + }; + }; + bomber = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/bomber-15.08.1.tar.xz"; + sha256 = "08l8ksqzap8hyza7mmf1wwddj8xkl03hsrc0mwvxsvyp7h7v3rxq"; + name = "bomber-15.08.1.tar.xz"; + }; + }; + ksquares = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ksquares-15.08.1.tar.xz"; + sha256 = "17qx89q594w22nd2qhqcmb1wc291b89zs22jh62xrm62yr6h9ijj"; + name = "ksquares-15.08.1.tar.xz"; + }; + }; + konquest = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/konquest-15.08.1.tar.xz"; + sha256 = "0ss7gvr8ihk7ip4dhxyps8h1137i5m20m6sf0rv10c2h0y9cy0zk"; + name = "konquest-15.08.1.tar.xz"; + }; + }; + parley = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/parley-15.08.1.tar.xz"; + sha256 = "0f88ia58f9lw8rpz1mgr21hslkmwnwwf2ac0affm81b17nxx8zpc"; + name = "parley-15.08.1.tar.xz"; + }; + }; + kate = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kate-15.08.1.tar.xz"; + sha256 = "0hrbr4lnmz0hgs856kfb966k85p8ccdzva8h4f6ifvacgxppb5iz"; + name = "kate-15.08.1.tar.xz"; + }; + }; + baloo-widgets = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/baloo-widgets-15.08.1.tar.xz"; + sha256 = "021lgivqmahad2b5mwdg4vngyyfi6gcsk3xgn9rbzkxg67k2ivbc"; + name = "baloo-widgets-15.08.1.tar.xz"; + }; + }; + kbreakout = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kbreakout-15.08.1.tar.xz"; + sha256 = "1l83iy6iad6npykl4dyh45s5z8pgamdp7aqi2r5c9r4awg16iq48"; + name = "kbreakout-15.08.1.tar.xz"; + }; + }; + kshisen = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kshisen-15.08.1.tar.xz"; + sha256 = "1lrn5l4jscbn0ppppshpkh62plskzwy2km9dqp1hp5czpq5zvwk8"; + name = "kshisen-15.08.1.tar.xz"; + }; + }; + dragon = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/dragon-15.08.1.tar.xz"; + sha256 = "0ffb0jspckwp8alis70akhrv7kkjq69zba34y61axm67f65izh9l"; + name = "dragon-15.08.1.tar.xz"; + }; + }; + ktp-common-internals = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ktp-common-internals-15.08.1.tar.xz"; + sha256 = "13alrk7zn3vq6khackdbyqbk209ivvcfza9mpqaxxll8sg9r3i3k"; + name = "ktp-common-internals-15.08.1.tar.xz"; + }; + }; + ktp-text-ui = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ktp-text-ui-15.08.1.tar.xz"; + sha256 = "1f7r47rbcciq12c5531qb9wr7xqz7nvsy04jk8gaxwdsr9a97ayf"; + name = "ktp-text-ui-15.08.1.tar.xz"; + }; + }; + kcalcore = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kcalcore-15.08.1.tar.xz"; + sha256 = "0dpip8hbc5fb8yw876lig19kp2wi71dkwcb1mj8k49lph09k3460"; + name = "kcalcore-15.08.1.tar.xz"; + }; + }; + kremotecontrol = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kremotecontrol-15.08.1.tar.xz"; + sha256 = "01fck27b3ilni2h78lmhq27aq4sw89060bh69xhw8z80iad2bxyy"; + name = "kremotecontrol-15.08.1.tar.xz"; + }; + }; + ktp-kded-module = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ktp-kded-module-15.08.1.tar.xz"; + sha256 = "0l2s07z87q2j92q4w6n16rbvd7xm8k4zgchlk06djb5d9gwdgvl0"; + name = "ktp-kded-module-15.08.1.tar.xz"; + }; + }; + kapptemplate = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kapptemplate-15.08.1.tar.xz"; + sha256 = "1pc3dq3h30lx7d51zan52mnz5zwb70g6r84cskkgc2dmws7mrl0k"; + name = "kapptemplate-15.08.1.tar.xz"; + }; + }; + dolphin-plugins = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/dolphin-plugins-15.08.1.tar.xz"; + sha256 = "1fpsbxcds2wzivcpc6vf6bqwi658mw4jrlpwd52w2nlsjpmgr31x"; + name = "dolphin-plugins-15.08.1.tar.xz"; + }; + }; + kpat = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kpat-15.08.1.tar.xz"; + sha256 = "0cw17agpx23fsmnnvwkjn3xvq59d6hpppgydalnhrqka9321qy2d"; + name = "kpat-15.08.1.tar.xz"; + }; + }; + akonadi = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/akonadi-15.08.1.tar.xz"; + sha256 = "19222mzvi34lqdaxavcpx0d1mxfnfynvhv5562rw3d7iqmhvbms6"; + name = "akonadi-15.08.1.tar.xz"; + }; + }; + kcalc = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kcalc-15.08.1.tar.xz"; + sha256 = "02xj9n6zv3f3m35g38gsmqnrshbswqkya930sc5nqc0mlyflli6m"; + name = "kcalc-15.08.1.tar.xz"; + }; + }; + sweeper = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/sweeper-15.08.1.tar.xz"; + sha256 = "08vk9yq7py576irkg34d3rzkdrzi6bb6zhynbyziyx097sqj5khj"; + name = "sweeper-15.08.1.tar.xz"; + }; + }; + lokalize = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/lokalize-15.08.1.tar.xz"; + sha256 = "15xsx430a9w3kr1abvlh4h3spn063992mc76rq17c7a8n1n7zr4b"; + name = "lokalize-15.08.1.tar.xz"; + }; + }; + step = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/step-15.08.1.tar.xz"; + sha256 = "15capfa297s4shrr6xwbpg62rn8pimwpmjm11p160g6lqdspwacm"; + name = "step-15.08.1.tar.xz"; + }; + }; + picmi = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/picmi-15.08.1.tar.xz"; + sha256 = "16sa0w3bhxbj8f8nl0wh5b639gzi6y45167g3mh62a7di6llw1rm"; + name = "picmi-15.08.1.tar.xz"; + }; + }; + kig = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kig-15.08.1.tar.xz"; + sha256 = "0wyvqfsgr1101vmzmsixribvd9plys91dvrx6cj9ji7mf4k5875g"; + name = "kig-15.08.1.tar.xz"; + }; + }; + ktp-contact-runner = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ktp-contact-runner-15.08.1.tar.xz"; + sha256 = "1m8jc39l9d394x3hqlqvc5msy7wi1aki9q8nd4bg6nmdz8v5dxz9"; + name = "ktp-contact-runner-15.08.1.tar.xz"; + }; + }; + kimap = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kimap-15.08.1.tar.xz"; + sha256 = "07q4z16jfddh17khdd39dzasjfmnvd2zgdnph24s171815c2x2ps"; + name = "kimap-15.08.1.tar.xz"; + }; + }; + ksystemlog = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ksystemlog-15.08.1.tar.xz"; + sha256 = "1v18f6dcirr6rayaxy8h85swj04g5giafs67h64g9flq5gacykji"; + name = "ksystemlog-15.08.1.tar.xz"; + }; + }; + kio-extras = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kio-extras-15.08.1.tar.xz"; + sha256 = "06vnr10a3m4gs5bjz3dqx1bv1sqz3q69ihq1hlih4c8lyy9wd26q"; + name = "kio-extras-15.08.1.tar.xz"; + }; + }; + blinken = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/blinken-15.08.1.tar.xz"; + sha256 = "0yh5ay2cpgb45y4any6sanzpwcngfxl98x3gnc5n81zl2kzb9y8m"; + name = "blinken-15.08.1.tar.xz"; + }; + }; + ktp-send-file = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ktp-send-file-15.08.1.tar.xz"; + sha256 = "07pk6d1rzz0hwfsw7nk4grixvvjja219jvr56j50vpnlmlza29xs"; + name = "ktp-send-file-15.08.1.tar.xz"; + }; + }; + kdiamond = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kdiamond-15.08.1.tar.xz"; + sha256 = "1f81l6pnwrpirb5v0npcd2452dkdh0llpmzh57gfd8cik0n1agzm"; + name = "kdiamond-15.08.1.tar.xz"; + }; + }; + kholidays = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kholidays-15.08.1.tar.xz"; + sha256 = "1i875c7wpp5vlzjyw78bsxgyhmhv2y9846xbv6xi5y4b211iw6lf"; + name = "kholidays-15.08.1.tar.xz"; + }; + }; + kbounce = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kbounce-15.08.1.tar.xz"; + sha256 = "127b7c4rpkz04nihqyl7d594k9vwjcvlq0758jfmkxijsgpjc334"; + name = "kbounce-15.08.1.tar.xz"; + }; + }; + kaccounts-integration = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kaccounts-integration-15.08.1.tar.xz"; + sha256 = "07kryp71xq2zwfdm05g8mcmkmxhlj2wb2l9fi2sxbhsr360z33mx"; + name = "kaccounts-integration-15.08.1.tar.xz"; + }; + }; + lskat = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/lskat-15.08.1.tar.xz"; + sha256 = "13vhfpi34qcv6q56qaxwk89apss8l921a59qvlmadmw999h7ms0s"; + name = "lskat-15.08.1.tar.xz"; + }; + }; + libkdeedu = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/libkdeedu-15.08.1.tar.xz"; + sha256 = "09fv1fbxlf6n4k0fyiy49avykpnxbmvi833i6ibm90v9csrfv6hf"; + name = "libkdeedu-15.08.1.tar.xz"; + }; + }; + libkeduvocdocument = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/libkeduvocdocument-15.08.1.tar.xz"; + sha256 = "0fz8fkcai1zdmqhvcic689sbwm07zg69z7jw4m6wgk7yqls8mkvq"; + name = "libkeduvocdocument-15.08.1.tar.xz"; + }; + }; + akonadi-search = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/akonadi-search-15.08.1.tar.xz"; + sha256 = "0mzhil4ihs2b7k6dg29d5igpwsiwiv6awzvj6b5xn76i4xax1jk1"; + name = "akonadi-search-15.08.1.tar.xz"; + }; + }; + katomic = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/katomic-15.08.1.tar.xz"; + sha256 = "0rj6sgh8v8x57fqbjvhik9xcw563nx0dvv8rin05nr22hlid8l9y"; + name = "katomic-15.08.1.tar.xz"; + }; + }; + kross-interpreters = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kross-interpreters-15.08.1.tar.xz"; + sha256 = "1lqkmxxw1kz23q4pmmvrwqgi9vkxp0pw6g3zpr0x4zkzsj62q2ff"; + name = "kross-interpreters-15.08.1.tar.xz"; + }; + }; + audiocd-kio = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/audiocd-kio-15.08.1.tar.xz"; + sha256 = "0sqh21x12za743xqmyfyd8h4z0wz0nzd2zjp6fzga76xfcryci5j"; + name = "audiocd-kio-15.08.1.tar.xz"; + }; + }; + mplayerthumbs = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/mplayerthumbs-15.08.1.tar.xz"; + sha256 = "01l063iply1d4bfdb04agj11imha4fpnv131dcfd39ixi1icv8yb"; + name = "mplayerthumbs-15.08.1.tar.xz"; + }; + }; + syndication = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/syndication-15.08.1.tar.xz"; + sha256 = "1kklbw77iiiqfcv8sydy9jkc8g630xw551y6r1jp1wbvrdkjwq47"; + name = "syndication-15.08.1.tar.xz"; + }; + }; + kqtquickcharts = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kqtquickcharts-15.08.1.tar.xz"; + sha256 = "0jjn8nrxqjpsg9cwfazqz7v4lacl99wxhdh9mclqxk4xy54ydxqc"; + name = "kqtquickcharts-15.08.1.tar.xz"; + }; + }; + kmouth = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kmouth-15.08.1.tar.xz"; + sha256 = "1w6jgs9skis1y8g07hdzwpdsa7dmzfi5dw82wx0wnnmdm076vg41"; + name = "kmouth-15.08.1.tar.xz"; + }; + }; + dolphin = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/dolphin-15.08.1.tar.xz"; + sha256 = "09mr54zbyyq4kd3ddi054c86ji63b0k5fjd3y8x44vnd3id8jpjs"; + name = "dolphin-15.08.1.tar.xz"; + }; + }; + libkdcraw = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/libkdcraw-15.08.1.tar.xz"; + sha256 = "0kshhch81sqjlashbh3ww3nz9ahv99f1bsxlrly39rvfa8yg6vpv"; + name = "libkdcraw-15.08.1.tar.xz"; + }; + }; + libksane = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/libksane-15.08.1.tar.xz"; + sha256 = "0ih4axq0pcpvmgs8x12ad22bxixcccqpkqs160vxl7a29327rbdm"; + name = "libksane-15.08.1.tar.xz"; + }; + }; + kmines = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kmines-15.08.1.tar.xz"; + sha256 = "12n4im9vqyym5jr0chs4g3wjlr2d2a3i35jhm52j8ibdx7fnpmw6"; + name = "kmines-15.08.1.tar.xz"; + }; + }; + kiriki = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kiriki-15.08.1.tar.xz"; + sha256 = "1ighd4bmvgn84misb7zldjg5z75k1i7z8l7yjb0qybh1cc2bw3b3"; + name = "kiriki-15.08.1.tar.xz"; + }; + }; + kaccessible = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kaccessible-15.08.1.tar.xz"; + sha256 = "10crgqpiqkbrb0hil1660cy4dcywiljicqhnhr3nns0ncllvw2vi"; + name = "kaccessible-15.08.1.tar.xz"; + }; + }; + ksnapshot = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ksnapshot-15.08.1.tar.xz"; + sha256 = "19z3rbvkn55waig6dm1lvan6wlndshhjbiqwwdlc9nh2wng8dcd0"; + name = "ksnapshot-15.08.1.tar.xz"; + }; + }; + kamera = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kamera-15.08.1.tar.xz"; + sha256 = "0czpr3wb3irlbczrx0dczph6l9dwhz3wv9amrz2lvb8p9c8j4nmd"; + name = "kamera-15.08.1.tar.xz"; + }; + }; + kdenetwork-filesharing = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kdenetwork-filesharing-15.08.1.tar.xz"; + sha256 = "03w78qf8sgwypzgwpyl5cfb5441787j6vzzhlddsbmkrl4vnhnff"; + name = "kdenetwork-filesharing-15.08.1.tar.xz"; + }; + }; + kmag = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kmag-15.08.1.tar.xz"; + sha256 = "02bhjmmqb28qyacqzikrkxgh1zf4v1012kdjpdczsmnrgb1nmpgl"; + name = "kmag-15.08.1.tar.xz"; + }; + }; + kalarmcal = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kalarmcal-15.08.1.tar.xz"; + sha256 = "02m2fd98jdacr7hm71dl6hsshil152c09p1daaa9b58yrgb9dqd9"; + name = "kalarmcal-15.08.1.tar.xz"; + }; + }; + kstars = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kstars-15.08.1.tar.xz"; + sha256 = "049pnbqn1ddmqd663vc181yh5z204klbs255w41k7p1z1vl5zszr"; + name = "kstars-15.08.1.tar.xz"; + }; + }; + ktp-approver = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ktp-approver-15.08.1.tar.xz"; + sha256 = "0qdax2zby93xc694s3s6s21y4bfjbfxsd292ag544cwazcjz8zp5"; + name = "ktp-approver-15.08.1.tar.xz"; + }; + }; + kdesdk-kioslaves = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kdesdk-kioslaves-15.08.1.tar.xz"; + sha256 = "161885bzayf804pdci5n1xh1n4zw3pddk2j53icn573gzpvczwla"; + name = "kdesdk-kioslaves-15.08.1.tar.xz"; + }; + }; + kdenetwork-strigi-analyzers = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kdenetwork-strigi-analyzers-15.08.1.tar.xz"; + sha256 = "0w3jlg9idsxi1pwxh97s9iawjyq8m2z51kz5mm0d0irwslkwaygk"; + name = "kdenetwork-strigi-analyzers-15.08.1.tar.xz"; + }; + }; + juk = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/juk-15.08.1.tar.xz"; + sha256 = "0l6zq90jvhkhppjq0djmj1ij1c1yjjvhh5ss4czqn39bay33r2a7"; + name = "juk-15.08.1.tar.xz"; + }; + }; + kolf = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kolf-15.08.1.tar.xz"; + sha256 = "05xldbfkbbvmq743029cksgdcsfn20xadn91sw1yp9146k0bd97h"; + name = "kolf-15.08.1.tar.xz"; + }; + }; + print-manager = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/print-manager-15.08.1.tar.xz"; + sha256 = "0cy5ga11kk11ca4nzpr6wjb4a342ziaflilc9pz6l3b7r8vhjv09"; + name = "print-manager-15.08.1.tar.xz"; + }; + }; + kppp = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kppp-15.08.1.tar.xz"; + sha256 = "1v2dqb9bdi1yl4fpyn98iq8pg69r9pfy7z1wbq6b37nwlhlapva8"; + name = "kppp-15.08.1.tar.xz"; + }; + }; + bovo = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/bovo-15.08.1.tar.xz"; + sha256 = "1lj2hwjdwkn70gfgyk3v0r8wdrdlpqkx9n17fd15x0jm8xjxc7wj"; + name = "bovo-15.08.1.tar.xz"; + }; + }; + ktimer = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ktimer-15.08.1.tar.xz"; + sha256 = "07882zpgalf2yzqplg3mzl6sxh84zfkbk1jwlw8kwkr7pr7lmfvv"; + name = "ktimer-15.08.1.tar.xz"; + }; + }; + kpimtextedit = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kpimtextedit-15.08.1.tar.xz"; + sha256 = "1djk0gyfdxsqjwhrqf4rnkjvy7hz1rysdm3idjqrnjhnlrjwsiwc"; + name = "kpimtextedit-15.08.1.tar.xz"; + }; + }; + filelight = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/filelight-15.08.1.tar.xz"; + sha256 = "085n071j5mpzh2yr4035bdxgfay782g4zx386lr2s03ywc5icsw2"; + name = "filelight-15.08.1.tar.xz"; + }; + }; + khangman = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/khangman-15.08.1.tar.xz"; + sha256 = "1g60s028b08vd34l7n8m4sd7d9zl419kz8f1hvdgs2z9zacd5zqg"; + name = "khangman-15.08.1.tar.xz"; + }; + }; + kteatime = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kteatime-15.08.1.tar.xz"; + sha256 = "0bsy22dgfpsibkpi0nv4245mxaf0xnh8rpaia8mzrh0d72gf2syb"; + name = "kteatime-15.08.1.tar.xz"; + }; + }; + gpgmepp = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/gpgmepp-15.08.1.tar.xz"; + sha256 = "1nr4k3k34cmmvn4mznnr4kgvbi4raan96phbiqzgh6mzkq2rc8yr"; + name = "gpgmepp-15.08.1.tar.xz"; + }; + }; + ktp-contact-list = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ktp-contact-list-15.08.1.tar.xz"; + sha256 = "0x8fvfqjjrhdnfaa9ybagf33lv1r21bywkipvkp2f81dalsd1sv0"; + name = "ktp-contact-list-15.08.1.tar.xz"; + }; + }; + klettres = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/klettres-15.08.1.tar.xz"; + sha256 = "0ykb5pfawiyby2xshfdq2gy7w66dw5vhqdd4vjkix6nyb87n703z"; + name = "klettres-15.08.1.tar.xz"; + }; + }; + kidentitymanagement = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kidentitymanagement-15.08.1.tar.xz"; + sha256 = "0aslniqzp8bgayvvrxkdfb9ihvz57n6zf3rh99dsv34z20mfyc59"; + name = "kidentitymanagement-15.08.1.tar.xz"; + }; + }; + libkdegames = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/libkdegames-15.08.1.tar.xz"; + sha256 = "0khr3rih3yv2vh9q2dkvdc2r1lpxhky5hmh7gachhyjh0296i9nq"; + name = "libkdegames-15.08.1.tar.xz"; + }; + }; + kmailtransport = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kmailtransport-15.08.1.tar.xz"; + sha256 = "18gnhw49df0f7j0n0nzfnr5v6wvl37mf82slwbsrjqvhj60b2xsg"; + name = "kmailtransport-15.08.1.tar.xz"; + }; + }; + kbruch = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kbruch-15.08.1.tar.xz"; + sha256 = "1mdbrfj7g92v5yzpdi0cccmhf5vdy7y5blbnk50p56qaq8w8avm2"; + name = "kbruch-15.08.1.tar.xz"; + }; + }; + zeroconf-ioslave = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/zeroconf-ioslave-15.08.1.tar.xz"; + sha256 = "1h8v78b6fb82brpxkhlwyphb830ndzlq4z5llgav1dy7i0v8pd7r"; + name = "zeroconf-ioslave-15.08.1.tar.xz"; + }; + }; + kdegraphics-thumbnailers = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kdegraphics-thumbnailers-15.08.1.tar.xz"; + sha256 = "1qavbvczjikad4kg28lq6zbb7dvllfw5nggilrs0s2qar7jqlrkw"; + name = "kdegraphics-thumbnailers-15.08.1.tar.xz"; + }; + }; + kreversi = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kreversi-15.08.1.tar.xz"; + sha256 = "0clxm23a0m5j8aj3cp1va5s38y0y5wr7akwmigpk37xjylzp1xdd"; + name = "kreversi-15.08.1.tar.xz"; + }; + }; + kdewebdev = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kdewebdev-15.08.1.tar.xz"; + sha256 = "00q25xp28m9sfgs7h4g89gyh34v36zwmliz1jvsq18aja45f5hpm"; + name = "kdewebdev-15.08.1.tar.xz"; + }; + }; + kgoldrunner = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kgoldrunner-15.08.1.tar.xz"; + sha256 = "18xs36g9gmhzlwyg2gl9cc3842dzwc196dpfp0xshja2f1rlr6fp"; + name = "kgoldrunner-15.08.1.tar.xz"; + }; + }; + kde-base-artwork = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-base-artwork-15.08.1.tar.xz"; + sha256 = "081mrc0s2lnbzwmmy9hwqas28cl6jzdycwxx3vfn4rvsgw4cgrp2"; + name = "kde-base-artwork-15.08.1.tar.xz"; + }; + }; + kiten = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kiten-15.08.1.tar.xz"; + sha256 = "1pz9frvf23hi2hy7g040prcgjvjssgv3yya2kvapafpmbwnd38dv"; + name = "kiten-15.08.1.tar.xz"; + }; + }; + kmahjongg = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kmahjongg-15.08.1.tar.xz"; + sha256 = "193ynx3da2nyaf2ixq7gc93nv8p9djslh8m666kdnqcxarlxd2qn"; + name = "kmahjongg-15.08.1.tar.xz"; + }; + }; + kcolorchooser = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kcolorchooser-15.08.1.tar.xz"; + sha256 = "1ig03dg4baf29hhim1m77bzwnm6mqqyzbmyhk6g92mj5883nnfb7"; + name = "kcolorchooser-15.08.1.tar.xz"; + }; + }; + kapman = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kapman-15.08.1.tar.xz"; + sha256 = "070zckasm7bm1g01rvp55gbilyzxqs5gsrp56zp3lyids0ycjfgz"; + name = "kapman-15.08.1.tar.xz"; + }; + }; + gwenview = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/gwenview-15.08.1.tar.xz"; + sha256 = "0lks7chyd8bylz1m3nv3bfch5jcffkv52aawxv9r5www9wd7jq69"; + name = "gwenview-15.08.1.tar.xz"; + }; + }; + kcron = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kcron-15.08.1.tar.xz"; + sha256 = "1s90bmlfbhcfiq6iizp4sq0z3ds8nrqghckcx9zrbyyj852llh0f"; + name = "kcron-15.08.1.tar.xz"; + }; + }; + kdeartwork = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kdeartwork-15.08.1.tar.xz"; + sha256 = "0j37pzih616fv1k6i3hll6qkxh42v9gkhy5vl57ancx7a5kxikyc"; + name = "kdeartwork-15.08.1.tar.xz"; + }; + }; + ktp-accounts-kcm = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ktp-accounts-kcm-15.08.1.tar.xz"; + sha256 = "1qk25v0ivxkv8cyq4y44ixz9rx28djfxk06zcvn2m1rwjqhrx204"; + name = "ktp-accounts-kcm-15.08.1.tar.xz"; + }; + }; + kdepim-runtime = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kdepim-runtime-15.08.1.tar.xz"; + sha256 = "1hcg900bnjryxii3f1c2yjj2nr3z4pn7yigdxclmwpfk6gvlkqm4"; + name = "kdepim-runtime-15.08.1.tar.xz"; + }; + }; + kfloppy = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kfloppy-15.08.1.tar.xz"; + sha256 = "0yg94p5gj9xazl9kk503mblawyndv2j6m0scf6na68xksgx0yplv"; + name = "kfloppy-15.08.1.tar.xz"; + }; + }; + kopete = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kopete-15.08.1.tar.xz"; + sha256 = "0949m4xw94hnw79c6ar8m9qjcx7r14qs6jww3pcnab7r0ax4xahb"; + name = "kopete-15.08.1.tar.xz"; + }; + }; + okular = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/okular-15.08.1.tar.xz"; + sha256 = "0nicpz25srpn9zmwjxrnz8h2ba597ixsqcyhymki465dv5hgx5x7"; + name = "okular-15.08.1.tar.xz"; + }; + }; + kdf = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kdf-15.08.1.tar.xz"; + sha256 = "062rz8syp7kxc9xyl4ldcqx66fdrjh5fhgdqgdjdgpn273n5v447"; + name = "kdf-15.08.1.tar.xz"; + }; + }; + kfourinline = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kfourinline-15.08.1.tar.xz"; + sha256 = "19rssc5mf8hn6fv9pm91pbhdcxp123z9c1wrmay1wmja7fmnyv9s"; + name = "kfourinline-15.08.1.tar.xz"; + }; + }; + kdeedu-data = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kdeedu-data-15.08.1.tar.xz"; + sha256 = "1yfx8526i753ifmcyh9r481cqiqzs4wh3xm1ys5x8pspg9rpn0wi"; + name = "kdeedu-data-15.08.1.tar.xz"; + }; + }; + kubrick = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kubrick-15.08.1.tar.xz"; + sha256 = "1sanlaz70m1jpaxjwlx2gljh57gg4gdcz7y9g2w191667yk0kq8g"; + name = "kubrick-15.08.1.tar.xz"; + }; + }; + svgpart = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/svgpart-15.08.1.tar.xz"; + sha256 = "10vvnsm7xlgy5fia8l8cz6cgj4xsjshiqkiiwkzlmyzzx081zi57"; + name = "svgpart-15.08.1.tar.xz"; + }; + }; + kanagram = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kanagram-15.08.1.tar.xz"; + sha256 = "0bchwvr87wj9p82v1vgdmfw0a8d1gax08ccq24lzigrny6ljlizr"; + name = "kanagram-15.08.1.tar.xz"; + }; + }; + klickety = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/klickety-15.08.1.tar.xz"; + sha256 = "1prbr2401jy4pifcyn8dy6q34f1nrhvhh8gm8p5jbr1jkzxmm1k1"; + name = "klickety-15.08.1.tar.xz"; + }; + }; + kgpg = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kgpg-15.08.1.tar.xz"; + sha256 = "0728pb6d70qfrbmd1d16lwxshy3ifb8snx5bi8vp9rrs7ncy8r4a"; + name = "kgpg-15.08.1.tar.xz"; + }; + }; + kdepim = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kdepim-15.08.1.tar.xz"; + sha256 = "06j6zmizkc8yg59dvnbcla82jb4csrwrvzzk3al18j6js0sdjnqr"; + name = "kdepim-15.08.1.tar.xz"; + }; + }; + granatier = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/granatier-15.08.1.tar.xz"; + sha256 = "1ngdjgf3imdbv1hmp88fhnpvpspjgl2zpaig3d96fjlhxh0bgng1"; + name = "granatier-15.08.1.tar.xz"; + }; + }; + knetwalk = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/knetwalk-15.08.1.tar.xz"; + sha256 = "0biis3gz943s09dzdxxdpkpizy3qzp9csi72njbm3bapxwmcflr2"; + name = "knetwalk-15.08.1.tar.xz"; + }; + }; + rocs = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/rocs-15.08.1.tar.xz"; + sha256 = "1s3mdi9hqhajryax4yg074dn0h5yq9fq4a8j6ksgg7a2ggl4l8kv"; + name = "rocs-15.08.1.tar.xz"; + }; + }; + kde-dev-utils = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-dev-utils-15.08.1.tar.xz"; + sha256 = "0jashpk1gjcf74b4vpkyrab2izp18ddwi0xky4v47micicl7wm5n"; + name = "kde-dev-utils-15.08.1.tar.xz"; + }; + }; + kdesdk-thumbnailers = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kdesdk-thumbnailers-15.08.1.tar.xz"; + sha256 = "0719qaw9whp1aa15cxcz7axfhmcm30iwwrr78xypzcy097f63q4v"; + name = "kdesdk-thumbnailers-15.08.1.tar.xz"; + }; + }; + kigo = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kigo-15.08.1.tar.xz"; + sha256 = "1vwkan7zlafisx4kap4bby4d2ndqnqbj7jrc00xgbw43l81kn4ix"; + name = "kigo-15.08.1.tar.xz"; + }; + }; + jovie = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/jovie-15.08.1.tar.xz"; + sha256 = "021j7rxbbv5p2jjp4d7m7vsdy5117myng2min42bn6vfz4g6s5rx"; + name = "jovie-15.08.1.tar.xz"; + }; + }; + amor = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/amor-15.08.1.tar.xz"; + sha256 = "125s9hsj4s3h21khgri9p52abkaa78a9yz7fnw5ij4i0ivhbks6a"; + name = "amor-15.08.1.tar.xz"; + }; + }; + kspaceduel = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kspaceduel-15.08.1.tar.xz"; + sha256 = "0anviqhcmyfnyq9zz6hh8cka75hy5ydxq5yvz7q0g6c3flj34fq2"; + name = "kspaceduel-15.08.1.tar.xz"; + }; + }; + libkipi = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/libkipi-15.08.1.tar.xz"; + sha256 = "0mmk8zfwffns7gacdjhjh45ki762wpd21nwvgbjclf3rjzgbyxz8"; + name = "libkipi-15.08.1.tar.xz"; + }; + }; + kgeography = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kgeography-15.08.1.tar.xz"; + sha256 = "1ilb9l6v8pf7aq9dzs29bbdqb60fzf7a0dwjjdfvjq8jbnhcxa9v"; + name = "kgeography-15.08.1.tar.xz"; + }; + }; + kajongg = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kajongg-15.08.1.tar.xz"; + sha256 = "1ialza77fc0a6541yg71b8qbjvq78sww7l0g3s1rn30pj1j1r3rx"; + name = "kajongg-15.08.1.tar.xz"; + }; + }; + kolourpaint = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kolourpaint-15.08.1.tar.xz"; + sha256 = "1m0dwv2wxf5nsisg4zc6h1cqbnzv4187il7y45rbkxli430jh43d"; + name = "kolourpaint-15.08.1.tar.xz"; + }; + }; + marble = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/marble-15.08.1.tar.xz"; + sha256 = "0dx0r1hjcfn3mvmsw0wgaw57jkn42166aj97ky0zdhdavkqv4j3j"; + name = "marble-15.08.1.tar.xz"; + }; + }; + kblog = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kblog-15.08.1.tar.xz"; + sha256 = "0a5ycnk0ljw8k4m5pm7cn37ijjq9x1p2hxf4k77jb7aw1apyqv15"; + name = "kblog-15.08.1.tar.xz"; + }; + }; + kget = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kget-15.08.1.tar.xz"; + sha256 = "02npfzdk283930jywhjch6sscnj16w2n3nn4ik04bx8hxv74br74"; + name = "kget-15.08.1.tar.xz"; + }; + }; + ktuberling = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ktuberling-15.08.1.tar.xz"; + sha256 = "1y9ifgg2086zz45pj32xxjrgnbsgiq7ajbjl8cybjxcx624j66ic"; + name = "ktuberling-15.08.1.tar.xz"; + }; + }; + krfb = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/krfb-15.08.1.tar.xz"; + sha256 = "0cpypajr483iwch385240zi5l0vf4j28k0sng0kszhizspkhvp35"; + name = "krfb-15.08.1.tar.xz"; + }; + }; + ktp-filetransfer-handler = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ktp-filetransfer-handler-15.08.1.tar.xz"; + sha256 = "135zpcl0g81xd9hljch05cjngs6x05cnzngzx5h5hsjf13fgz9cn"; + name = "ktp-filetransfer-handler-15.08.1.tar.xz"; + }; + }; + ktouch = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ktouch-15.08.1.tar.xz"; + sha256 = "1hlg1l1xpmpwvzz47vmif395pw9szjy93p8yxhqsdhkh1f4mdssq"; + name = "ktouch-15.08.1.tar.xz"; + }; + }; + kmplot = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kmplot-15.08.1.tar.xz"; + sha256 = "1a1b6vcxp1wkp6qfidwj42vqkh6wm4m64q0hm7zv6h01l10fzdm2"; + name = "kmplot-15.08.1.tar.xz"; + }; + }; + okteta = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/okteta-15.08.1.tar.xz"; + sha256 = "14mbfqc61rw2g89shh0ad38ph24c6nrj76qx9g1diazvr3p9sf1j"; + name = "okteta-15.08.1.tar.xz"; + }; + }; + kdepimlibs = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kdepimlibs-15.08.1.tar.xz"; + sha256 = "0sjh4n2hgcfd3ngbvzk051yzglkchcjhx0nnn12li0lw2bg7l9w3"; + name = "kdepimlibs-15.08.1.tar.xz"; + }; + }; + kwalletmanager = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kwalletmanager-15.08.1.tar.xz"; + sha256 = "1ibfiaglwgqxnsmx1f8pcylv0kzywpd2mvyawcdhcl3yqdpyw4v7"; + name = "kwalletmanager-15.08.1.tar.xz"; + }; + }; + kmime = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kmime-15.08.1.tar.xz"; + sha256 = "1rz9nmx01rd4asv8iggh47m7snm0fdvlc9f59jpkbch1wxf70vqc"; + name = "kmime-15.08.1.tar.xz"; + }; + }; + ktp-auth-handler = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ktp-auth-handler-15.08.1.tar.xz"; + sha256 = "0dwpaw2pvigc0lyqa29gxq49fp6rp5hh2wg6ysr1d00s54lr2qgw"; + name = "ktp-auth-handler-15.08.1.tar.xz"; + }; + }; + ktux = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ktux-15.08.1.tar.xz"; + sha256 = "1vw0ybkvrcqcng6sz0hw12bhsspig98m0wjn8phlyljfd5d8p4h3"; + name = "ktux-15.08.1.tar.xz"; + }; + }; + ffmpegthumbs = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ffmpegthumbs-15.08.1.tar.xz"; + sha256 = "00bk11zq5hkdkwxj7d4fydslh2gybhzxz2gyldjfdd8agjcl1rfm"; + name = "ffmpegthumbs-15.08.1.tar.xz"; + }; + }; + libkomparediff2 = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/libkomparediff2-15.08.1.tar.xz"; + sha256 = "1g8j5idy18a4fnc2m9cjg3xzq6kck070yq5ki4l9lbjinrhl3jpr"; + name = "libkomparediff2-15.08.1.tar.xz"; + }; + }; + kalgebra = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kalgebra-15.08.1.tar.xz"; + sha256 = "1an9lc9h1178d94pq2a60pnw9wadxdni3drbx40w1l1kfaa38ghy"; + name = "kalgebra-15.08.1.tar.xz"; + }; + }; + kblocks = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kblocks-15.08.1.tar.xz"; + sha256 = "1vvlxna5dmnf7igr53p3m5z224zj1ni92qifjnnblwr55gqqwsva"; + name = "kblocks-15.08.1.tar.xz"; + }; + }; + kblackbox = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kblackbox-15.08.1.tar.xz"; + sha256 = "1hnxsjdp9gbjc0049jx7bnzx0cykyc7qf6f2z3mrir8knin0fmi5"; + name = "kblackbox-15.08.1.tar.xz"; + }; + }; + kdegraphics-mobipocket = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kdegraphics-mobipocket-15.08.1.tar.xz"; + sha256 = "0fnrd2za98plc8aw2gmn83yar0m7ix5rg84lpfm0vnshkhrslqg6"; + name = "kdegraphics-mobipocket-15.08.1.tar.xz"; + }; + }; + ksnakeduel = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ksnakeduel-15.08.1.tar.xz"; + sha256 = "1q0hcya6dl2lfahqnwx18hl6cwmibsvlyf25x41d42669f7vm1zz"; + name = "ksnakeduel-15.08.1.tar.xz"; + }; + }; + kde-wallpapers = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-wallpapers-15.08.1.tar.xz"; + sha256 = "01q5yh4q7kjjryab3jc8g4qwi4w18la6na0ra2mf0cf637xnlh83"; + name = "kde-wallpapers-15.08.1.tar.xz"; + }; + }; + konsole = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/konsole-15.08.1.tar.xz"; + sha256 = "15d401xxqhd8sfjc6gpn7f1zcs5w8l6y2bjvjvidmpzmr24xky1j"; + name = "konsole-15.08.1.tar.xz"; + }; + }; + kdelibs = { + version = "4.14.12"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kdelibs-4.14.12.tar.xz"; + sha256 = "1s4p3x5si0mx64rhfqplgpyqm04c84wj4mpmbmi86wxwyr5d65rg"; + name = "kdelibs-4.14.12.tar.xz"; + }; + }; + cantor = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/cantor-15.08.1.tar.xz"; + sha256 = "0qcx077khzzjs8gaz2m1dph1r4ql3gpfsq536626fd94cb5is83x"; + name = "cantor-15.08.1.tar.xz"; + }; + }; + kmbox = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kmbox-15.08.1.tar.xz"; + sha256 = "1b4b9kk99kvcz4krixnzwvwf7ydkpbsrzza74f8ljbl40ldn94jn"; + name = "kmbox-15.08.1.tar.xz"; + }; + }; + kde-dev-scripts = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-dev-scripts-15.08.1.tar.xz"; + sha256 = "01s13qwji4d2sgbg85kj0ggg4mnl2vggangi8fpvaps03fpq7571"; + name = "kde-dev-scripts-15.08.1.tar.xz"; + }; + }; + krdc = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/krdc-15.08.1.tar.xz"; + sha256 = "1gx3vhl8w64ya71894lgy2i3kkggr84r1c5sx8nbwvapw5v4ngiz"; + name = "krdc-15.08.1.tar.xz"; + }; + }; + ktnef = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ktnef-15.08.1.tar.xz"; + sha256 = "04jq60qpbgaclscgpwx3sj0l67sqzk9zr01zr6fx127apqzc2xmh"; + name = "ktnef-15.08.1.tar.xz"; + }; + }; + kdenlive = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kdenlive-15.08.1.tar.xz"; + sha256 = "03rbkl3jblzprwb6sd7wycizpnpk65551ji53i2h7rxwsns53hig"; + name = "kdenlive-15.08.1.tar.xz"; + }; + }; + kwordquiz = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kwordquiz-15.08.1.tar.xz"; + sha256 = "0b20n7k8ging2gw6l0k09r71ww1dg0fh5y5lqzlzcl8vqhdwkwpp"; + name = "kwordquiz-15.08.1.tar.xz"; + }; + }; + libkface = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/libkface-15.08.1.tar.xz"; + sha256 = "0k2rsmnzfyab1x1nyirlhs48c19b2i2f0x60w1igp7b66n6819kd"; + name = "libkface-15.08.1.tar.xz"; + }; + }; + kde-baseapps = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kde-baseapps-15.08.1.tar.xz"; + sha256 = "1ngi571gs62qnpz1ph106ard13pfh9f1ljg4y4cyv77nv90x4a2k"; + name = "kde-baseapps-15.08.1.tar.xz"; + }; + }; + cervisia = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/cervisia-15.08.1.tar.xz"; + sha256 = "0cha7j0769ib8hc2jjgdxm1pv81cqwii721ww94dd4d614isv4pk"; + name = "cervisia-15.08.1.tar.xz"; + }; + }; + kmousetool = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/kmousetool-15.08.1.tar.xz"; + sha256 = "0snyqp2410bjkc5krxhkk08i3lyd5724513vs48lxdasv24jc0nz"; + name = "kmousetool-15.08.1.tar.xz"; + }; + }; + ksaneplugin = { + version = "15.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/15.08.1/src/ksaneplugin-15.08.1.tar.xz"; + sha256 = "0fx0y4js4nbbky342ly3aw59rbzz25mjb1da0hkykky9kxrcwnxk"; + name = "ksaneplugin-15.08.1.tar.xz"; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcabace3677..325efb2b70f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11779,6 +11779,7 @@ let kdeApps_15_04 = recurseIntoAttrs (callPackage ../applications/kde-apps-15.04 {}); kdeApps_stable = kdeApps_15_04; kdeApps_latest = kdeApps_15_04; + kdeApps_15_08 = recurseIntoAttrs (import ../applications/kde-apps-15.08 { inherit pkgs; }); keepnote = callPackage ../applications/office/keepnote { pygtk = pyGtkGlade; From 2e0589b4ca8f43dbce3e5af91c6e4375681ebee5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:11:01 -0500 Subject: [PATCH 13/43] kde414: build with kdelibs-4.14.12 Upstream changes to the build system required adjusting many packages' dependencies. On the Nixpkgs side, we no longer propagate the dependency on cmake (to reduce closure size), so downstream dependencies had to be adjusted for most packages that depend on kdelibs. --- pkgs/applications/audio/amarok/default.nix | 19 +++--- pkgs/applications/editors/kile/default.nix | 8 ++- pkgs/applications/graphics/digikam/2.nix | 32 ---------- .../applications/graphics/digikam/default.nix | 18 +++--- .../graphics/kgraphviewer/default.nix | 7 ++- .../graphics/kuickshow/default.nix | 4 +- pkgs/applications/misc/k3b/default.nix | 27 ++++---- .../misc/kde-wacomtablet/default.nix | 5 +- pkgs/applications/misc/kdeconnect/default.nix | 8 ++- pkgs/applications/misc/krename/default.nix | 7 ++- pkgs/applications/misc/krusader/default.nix | 7 ++- pkgs/applications/misc/rsibreak/default.nix | 5 +- pkgs/applications/misc/yakuake/default.nix | 5 +- .../browsers/kwebkitpart/default.nix | 4 +- .../networking/browsers/rekonq/default.nix | 7 ++- .../telepathy/kde/default.nix | 17 +++-- .../kwooty/0001-search-paths.patch | 33 ++++++++++ .../networking/newsreaders/kwooty/default.nix | 12 ++-- .../newsreaders/kwooty/searchPath.patch | 19 ------ pkgs/applications/office/basket/default.nix | 8 ++- pkgs/applications/office/calligra/default.nix | 9 +-- .../applications/office/eventlist/default.nix | 6 +- pkgs/applications/office/kbibtex/default.nix | 5 +- pkgs/applications/office/skrooge/default.nix | 5 +- pkgs/applications/office/zanshin/default.nix | 5 +- .../version-management/kdesvn/default.nix | 6 +- pkgs/applications/video/bangarang/default.nix | 14 ++++- pkgs/applications/video/k9copy/default.nix | 19 +++--- pkgs/applications/video/kdenlive/default.nix | 9 ++- pkgs/applications/video/kmplayer/default.nix | 10 +-- ...guard-0001-disable-signalplottertest.patch | 36 +++++++++++ .../files/rocs-0001-duplicate-add_test.patch | 62 +++++++++++++++++++ .../desktops/kde-4.14/kde-package/default.nix | 12 ++-- pkgs/desktops/kde-4.14/kde-runtime.nix | 4 +- pkgs/desktops/kde-4.14/kde-workspace.nix | 2 +- pkgs/desktops/kde-4.14/kdeedu/rocs.nix | 2 + pkgs/desktops/kde-4.14/kdegames/kpat.nix | 3 +- pkgs/desktops/kde-4.14/kdegames/palapeli.nix | 4 +- .../kde-4.14/kdegraphics/libkdcraw.nix | 2 - .../kde-4.14/kdelibs/nepomuk-core.nix | 4 +- pkgs/desktops/kde-4.14/kdepim-runtime.nix | 5 +- pkgs/desktops/kde-4.14/kdepimlibs.nix | 11 +++- pkgs/desktops/kde-4.14/kdeplasma-addons.nix | 4 +- pkgs/desktops/kde-4.14/kdesdk/okteta.nix | 4 +- pkgs/desktops/kde-4.14/l10n/default.nix | 10 ++- .../libraries/libalkimia/default.nix | 5 +- .../libraries/libkvkontakte/default.nix | 7 ++- .../analysis/massif-visualizer/default.nix | 6 +- pkgs/misc/themes/qtcurve/default.nix | 6 +- pkgs/tools/misc/colord-kde/default.nix | 8 ++- pkgs/tools/misc/kde-gtk-config/default.nix | 20 +++--- pkgs/tools/networking/plasma-nm/default.nix | 14 ++--- pkgs/tools/security/ksshaskpass/default.nix | 6 +- .../security/polkit-kde-agent/default.nix | 5 +- pkgs/tools/text/kdiff3/default.nix | 6 +- pkgs/top-level/all-packages.nix | 7 +-- 56 files changed, 385 insertions(+), 210 deletions(-) delete mode 100644 pkgs/applications/graphics/digikam/2.nix create mode 100644 pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch delete mode 100644 pkgs/applications/networking/newsreaders/kwooty/searchPath.patch create mode 100644 pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch create mode 100644 pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 6ecdc1f98d4..d99e1b7a150 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, lib, qtscriptgenerator, perl, gettext, curl -, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs -, qca2, libmtp, liblastfm, libgpod, pkgconfig, automoc4, phonon -, strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null }: +{ stdenv, fetchurl, lib, automoc4, cmake, perl, pkgconfig +, qtscriptgenerator, gettext, curl , libxml2, mysql, taglib +, taglib_extras, loudmouth , kdelibs , qca2, libmtp, liblastfm, libgpod +, phonon , strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null +}: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -16,9 +17,13 @@ stdenv.mkDerivation rec { QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; - buildInputs = [ qtscriptgenerator stdenv.cc.libc gettext curl - libxml2 mysql.lib taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi - soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa nepomuk_core ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + + buildInputs = [ + qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.lib + taglib taglib_extras loudmouth kdelibs phonon strigi soprano qca2 + libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core + ]; cmakeFlags = "-DKDE4_BUILD_TESTS=OFF"; diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index b428289b95d..7f7b22dfa13 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, kdelibs, cmake, gettext }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, shared_mime_info, kdelibs +}: stdenv.mkDerivation rec { name = "kile-2.1.3"; @@ -8,7 +10,9 @@ stdenv.mkDerivation rec { sha256 = "18nfi37s46v9xav7vyki3phasddgcy4m7nywzxis198vr97yqqx0"; }; - nativeBuildInputs = [ cmake gettext ]; + nativeBuildInputs = [ + automoc4 cmake gettext perl pkgconfig shared_mime_info + ]; buildInputs = [ kdelibs ]; # for KDE 4.7 the nl translations fail since kile-2.1.2 diff --git a/pkgs/applications/graphics/digikam/2.nix b/pkgs/applications/graphics/digikam/2.nix deleted file mode 100644 index e2ca03fe044..00000000000 --- a/pkgs/applications/graphics/digikam/2.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, -lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff, -liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost, -shared_desktop_ontologies, marble, libmysql }: - -stdenv.mkDerivation rec { - name = "digikam-2.9.0"; - - src = fetchurl { - url = "mirror://sourceforge/digikam/${name}.tar.bz2"; - sha256 = "181vf065j1zz26zahkb7hy3fk4837nvwm61cnykvni7w40w0zpbk"; - }; - - nativeBuildInputs = [ cmake automoc4 pkgconfig ]; - - buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff - jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw - opencv libkexiv2 libkipi boost shared_desktop_ontologies marble libmysql ]; - - # Make digikam find some FindXXXX.cmake - KDEDIRS="${marble}:${qjson}"; - - enableParallelBuilding = true; - - meta = { - description = "Photo Management Program"; - license = "GPL"; - homepage = http://www.digikam.org; - maintainers = with stdenv.lib.maintainers; [ viric urkud ]; - inherit (kdelibs.meta) platforms; - }; -} diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index b07b889ca13..bdf8077624d 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, automoc4, boost, shared_desktop_ontologies, cmake , eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun , libgphoto2, libjpeg, libkdcraw, libkexiv2, libkipi, libpgf, libtiff -, libusb1, liblqr1, marble, mysql, opencv, phonon, pkgconfig, qca2 -, qimageblitz, qjson, qt4, soprano +, libusb1, liblqr1, marble, mysql, opencv, perl, phonon, pkgconfig +, qca2, qimageblitz, qjson, qt4, soprano }: stdenv.mkDerivation rec { @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { sha256 = "081ldsaf3frf5khznjd3sxkjmi4dyp6w6nqnc2a0agkk0kxkl10m"; }; - nativeBuildInputs = [ cmake automoc4 pkgconfig ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; buildInputs = [ - boost eigen gettext jasper kdelibs kdepimlibs lcms lensfun - libgphoto2 libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf - libtiff marble mysql.lib opencv phonon qca2 qimageblitz qjson qt4 + boost eigen jasper kdelibs kdepimlibs lcms lensfun libgphoto2 + libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf libtiff marble + mysql.lib opencv phonon qca2 qimageblitz qjson qt4 shared_desktop_ontologies soprano ]; @@ -26,7 +26,11 @@ stdenv.mkDerivation rec { KDEDIRS="${marble}:${qjson}"; # Help digiKam find libusb, otherwise gphoto2 support is disabled - cmakeFlags = "-DLIBUSB_LIBRARIES=${libusb1}/lib -DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0 -DDIGIKAMSC_COMPILE_LIBKFACE=ON"; + cmakeFlags = [ + "-DLIBUSB_LIBRARIES=${libusb1}/lib" + "-DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0" + "-DDIGIKAMSC_COMPILE_LIBKFACE=ON" + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 21caf8f8002..6eb57c3dd5f 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, kdelibs, automoc4, boost, pkgconfig, graphviz, gettext }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, boost, graphviz +}: stdenv.mkDerivation rec { name = "kgraphviewer-${version}"; @@ -9,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "13zhjs57xavzrj4nrlqs35n35ihvzij7hgbszf5fhlp2a4d4rrqs"; }; - buildInputs = [ kdelibs automoc4 boost pkgconfig graphviz gettext ]; + buildInputs = [ kdelibs boost graphviz ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; meta = with stdenv.lib; { description = "A Graphviz dot graph viewer for KDE"; diff --git a/pkgs/applications/graphics/kuickshow/default.nix b/pkgs/applications/graphics/kuickshow/default.nix index 7a410642958..cfecd19df46 100644 --- a/pkgs/applications/graphics/kuickshow/default.nix +++ b/pkgs/applications/graphics/kuickshow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, imlib, cmake, pkgconfig, gettext }: +{ stdenv, fetchurl, automoc4, kdelibs, imlib, cmake, pkgconfig, gettext }: stdenv.mkDerivation rec { name = "kuickshow-0.9.1"; @@ -10,5 +10,5 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs imlib ]; - nativeBuildInputs = [ cmake gettext pkgconfig ]; + nativeBuildInputs = [ automoc4 cmake gettext pkgconfig ]; } diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix index 7730402a795..f48912aeb1e 100644 --- a/pkgs/applications/misc/k3b/default.nix +++ b/pkgs/applications/misc/k3b/default.nix @@ -1,24 +1,25 @@ -{ stdenv, fetchurl, makeWrapper, cmake, qt4, perl, shared_mime_info, libvorbis, taglib -, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext -, transcode, cdrdao, cdrtools, dvdplusrwtools, vcdimager, cdparanoia -, kdelibs, kdemultimedia, automoc4, phonon, libkcddb ? null +{ stdenv, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig +, shared_mime_info, libvorbis, taglib , flac, libsamplerate +, libdvdread, lame, libsndfile, libmad, gettext , transcode, cdrdao +, cdrtools, dvdplusrwtools, vcdimager, cdparanoia , kdelibs +, kdemultimedia, phonon, libkcddb ? null }: stdenv.mkDerivation rec { name = "k3b-2.0.3a"; - + src = fetchurl { url = "http://download.kde.org/stable/k3b/${name}.tar.xz"; sha256 = "10f07465g9860chfnvrp9w3m686g6j9f446xgnnx7h82d1sb42rd"; }; - buildInputs = - [ cmake qt4 perl shared_mime_info libvorbis taglib - flac libsamplerate libdvdread lame libsndfile - libmad gettext stdenv.cc.libc - kdelibs kdemultimedia automoc4 phonon - libkcddb makeWrapper cdparanoia - ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; + + buildInputs = [ + shared_mime_info libvorbis taglib flac libsamplerate libdvdread + lame libsndfile libmad stdenv.cc.libc kdelibs + kdemultimedia phonon libkcddb makeWrapper cdparanoia + ]; enableParallelBuilding = true; @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/k3b \ --prefix LD_LIBRARY_PATH ":" "${cdparanoia}/lib" ''; - + meta = with stdenv.lib; { description = "CD/DVD Burning Application for KDE"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/kde-wacomtablet/default.nix b/pkgs/applications/misc/kde-wacomtablet/default.nix index 1b71989f8b6..013efee8ec9 100644 --- a/pkgs/applications/misc/kde-wacomtablet/default.nix +++ b/pkgs/applications/misc/kde-wacomtablet/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, kdelibs, gettext, xf86_input_wacom }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, xf86_input_wacom }: stdenv.mkDerivation rec { name = "wacomtablet-2.1.0"; @@ -10,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs xf86_input_wacom ]; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; meta = with stdenv.lib; { description = "KDE Wacom graphic tablet configuration tool"; diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index 51b7b90ca4e..551d7c06468 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, gettext, kdelibs, libXtst, libfakekey, makeWrapper, pkgconfig, qca2 -, qjson +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig +, gettext, kdelibs, libXtst, libfakekey, makeWrapper, qca2, qjson }: stdenv.mkDerivation rec { @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1vrr047bq5skxvibv5pb9ch9dxh005zmar017jzbyb9hilxr8kg4"; }; - buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper pkgconfig qca2 qjson ]; + buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper qca2 qjson ]; + + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; meta = with stdenv.lib; { description = "A tool to connect and sync your devices with KDE"; diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index ff98bb5186a..1e4da7fa11f 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext, qt4, phonon }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, taglib, exiv2, podofo, qt4, phonon +}: stdenv.mkDerivation rec { name = "krename-4.0.9"; @@ -8,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "11bdg5vdcs393n0aibhm3jh3wxlk5kz78jhkwf7cj9086qkg9wds"; }; - buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext qt4 phonon ]; + buildInputs = [ kdelibs taglib exiv2 podofo qt4 phonon ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; meta = { homepage = http://www.krename.net; diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index 83c21da0e54..2a9c6305d42 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, gettext, kdelibs, kde_baseapps}: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, kde_baseapps +}: stdenv.mkDerivation rec { name = "krusader-2.4.0-beta1"; @@ -6,7 +8,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/krusader/${name}.tar.bz2"; sha256 = "1q1m4cjzz2m41pdpxnwrsiczc7990785b700lv64midjjgjnr7j6"; }; - buildInputs = [ gettext kdelibs kde_baseapps ]; + buildInputs = [ kdelibs kde_baseapps ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions meta = { description = "Norton/Total Commander clone for KDE"; diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix index 6587fb2debf..42247572c24 100644 --- a/pkgs/applications/misc/rsibreak/default.nix +++ b/pkgs/applications/misc/rsibreak/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, kdelibs, kdebase_workspace, gettext }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, kdebase_workspace }: let version = "0.11"; in @@ -10,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0g27aswh8iz5v67v1wkjny4p100vs2gm0lw0qzfkg6sw1pb4i519"; }; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; buildInputs = [ kdelibs kdebase_workspace ]; diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index 323782d60fe..10b63d1db51 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, kdelibs, gettext, konsole }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, konsole }: let pname = "yakuake"; @@ -14,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ kdelibs ]; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; patchPhase = '' substituteInPlace app/terminal.cpp --replace \"konsolepart\" "\"${konsole}/lib/kde4/libkonsolepart.so\"" diff --git a/pkgs/applications/networking/browsers/kwebkitpart/default.nix b/pkgs/applications/networking/browsers/kwebkitpart/default.nix index cb3a0e9eac4..173ffcb9330 100644 --- a/pkgs/applications/networking/browsers/kwebkitpart/default.nix +++ b/pkgs/applications/networking/browsers/kwebkitpart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, kdelibs }: +{ stdenv, fetchgit, automoc4, cmake, perl, pkgconfig, kdelibs }: stdenv.mkDerivation rec { name = "kwebkitpart-${version}"; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + meta = with stdenv.lib; { platforms = platforms.linux; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index ce36e26d6fc..df8ad1eb350 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, kde4, gettext, pkgconfig, shared_desktop_ontologies, qca2, qoauth }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kde4, shared_desktop_ontologies, qca2, qoauth }: assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077 @@ -12,7 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ kde4.kdelibs qca2 qoauth ]; - nativeBuildInputs = [ gettext pkgconfig shared_desktop_ontologies ]; + nativeBuildInputs = [ + automoc4 cmake gettext perl pkgconfig shared_desktop_ontologies + ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix index 564952480f2..532d68ad660 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix @@ -1,12 +1,19 @@ -{ stdenv, fetchurl, fetchgit, telepathy_qt, kdelibs, kde_workspace, gettext, dbus_libs, farstream -, pkgconfigUpstream , qt_gstreamer1, telepathy_glib, telepathy_logger, qjson, flex, bison, qca2 }: +{ stdenv, fetchurl, fetchgit, automoc4, cmake, gettext, perl, pkgconfig +, telepathy_qt, kdelibs, kde_workspace, dbus_glib, dbus_libs, farstream +, qt_gstreamer1, telepathy_glib, telepathy_logger +, qjson, flex, bison, qca2 }: let - pkgconfig = pkgconfigUpstream; version = "0.8.80"; manifest = import (./. + "/${version}.nix"); overrides = { + call_ui = x : x // { + NIX_CFLAGS_COMPILE = + "-I${telepathy_glib}/include/telepathy-1.0" + + " -I${dbus_glib}/include/dbus-1.0" + + " -I${dbus_libs}/include/dbus-1.0"; + }; telepathy_logger_qt = x : x // { NIX_CFLAGS_COMPILE = "-I${dbus_libs}/include/dbus-1.0"; }; @@ -38,7 +45,9 @@ let inherit sha256; }; - nativeBuildInputs = [ gettext pkgconfig ] ++ (stdenv.lib.attrByPath [ key ] [] extraNativeBuildInputs); + nativeBuildInputs = + [ automoc4 cmake gettext perl pkgconfig ] + ++ (stdenv.lib.attrByPath [ key ] [] extraNativeBuildInputs); buildInputs = [ kdelibs telepathy_qt ] ++ stdenv.lib.optional (name != "ktp-common-internals") ktp.common_internals ++ (stdenv.lib.attrByPath [ key ] [] extraBuildInputs); diff --git a/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch b/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch new file mode 100644 index 00000000000..6d1d2bac409 --- /dev/null +++ b/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch @@ -0,0 +1,33 @@ +From 6b5730e729d72c8d9242163e7061b956abee61f5 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sat, 12 Sep 2015 16:14:10 -0500 +Subject: [PATCH] search paths + +--- + src/utilities/utility.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/utilities/utility.cpp b/src/utilities/utility.cpp +index 2e322aa..2e9e4d2 100644 +--- a/src/utilities/utility.cpp ++++ b/src/utilities/utility.cpp +@@ -299,6 +299,7 @@ QString Utility::searchExternalPrograms(const QString& programToSearch, bool& pr + + QString programPathName; + QStringList searchPathList = Settings::searchPathList(); ++ searchPathList << "/usr/bin/unpar" << "/usr/bin/unrar" << "/usr/bin/7z"; + + QStringList programsWithDifferentNames = programToSearch.split(";"); + +@@ -368,7 +369,7 @@ QStringList Utility::buildPriorityArgument(const int& processPriority, const int + QStringList niceProcessArgs; + + // look for 'nice' location : +- QString nicePath = KStandardDirs::findExe("nice"); ++ QString nicePath = QString("/usr/bin/nice"); + niceProcessArgs.append(nicePath); + niceProcessArgs.append("-n"); + +-- +2.5.0 + diff --git a/pkgs/applications/networking/newsreaders/kwooty/default.nix b/pkgs/applications/networking/newsreaders/kwooty/default.nix index e49e2c6fe26..d8e417cdd3a 100644 --- a/pkgs/applications/networking/newsreaders/kwooty/default.nix +++ b/pkgs/applications/networking/newsreaders/kwooty/default.nix @@ -5,17 +5,17 @@ , unrar, p7zip, par2cmdline, coreutils }: -let version = "0.8.4"; +let version = "1.1.0"; name = "kwooty-${version}"; in stdenv.mkDerivation { inherit name; - + src = fetchurl { - url = "mirror://sourceforge/kwooty/${name}.tar.gz"; - sha256 = "0i3zmh7y52n5k0yn3xc6zjpjz75f48nly40n394i6sxy89psgfc2"; + url = "http://kde-apps.org/CONTENT/content-files/114385-${name}.tar.gz"; + sha256 = "10a9asjv6ja1xdjli2399dyka2rbia3qdm5bdpmcng6xdsbhx3ap"; }; - patches = [ ./searchPath.patch ]; + patches = [ ./0001-search-paths.patch ]; postPatch = '' echo "Changing paths to archive utilities to the nix store"; @@ -31,7 +31,7 @@ in stdenv.mkDerivation { kdelibs kdebase_workspace phonon libX11 libXext libXft ]; - + meta = { description = "Binary news reader of KDE"; }; diff --git a/pkgs/applications/networking/newsreaders/kwooty/searchPath.patch b/pkgs/applications/networking/newsreaders/kwooty/searchPath.patch deleted file mode 100644 index 602002d0173..00000000000 --- a/pkgs/applications/networking/newsreaders/kwooty/searchPath.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- kwooty-kwooty/src/utility.cpp 2012-01-24 22:22:45.091383072 +0100 -+++ kwooty-kwooty/src/utility.cpp 2012-01-24 22:29:08.526208140 +0100 -@@ -299,6 +299,7 @@ - - QString programPathName; - QStringList searchPathList = Settings::searchPathList(); -+ searchPathList << "/usr/bin/unpar" << "/usr/bin/unrar" << "/usr/bin/7z"; - - QStringList programsWithDifferentNames = programToSearch.split(";"); - -@@ -363,7 +364,7 @@ - QStringList niceProcessArgs; - - // look for 'nice' location : -- QString nicePath = KStandardDirs::findExe("nice"); -+ QString nicePath = QString("/usr/bin/nice"); - niceProcessArgs.append(nicePath); - niceProcessArgs.append("-n"); - diff --git a/pkgs/applications/office/basket/default.nix b/pkgs/applications/office/basket/default.nix index 023d133b4dd..2417e263d44 100644 --- a/pkgs/applications/office/basket/default.nix +++ b/pkgs/applications/office/basket/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, cmake, gettext, kdelibs, qimageblitz, kdepimlibs, gpgme }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, qimageblitz, kdepimlibs, gpgme +}: stdenv.mkDerivation rec { name = "basket-1.81"; @@ -12,8 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs qimageblitz kdepimlibs gpgme ]; - nativeBuildInputs = [ cmake gettext ]; - + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; + meta = { description = "A multi-purpose note-taking application"; homepage = http://basket.kde.org/; diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 0b28d13e4e5..3d1eada1db6 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa +{ stdenv, fetchurl, automoc4, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa , kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2 , fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, poppler_qt4 , libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular , libvisio, kactivities, mysql, postgresql, freetds, xbase, openexr, ilmbase , libodfgen, opencolorio, openjpeg, pstoedit, librevenge - }: +}: stdenv.mkDerivation rec { name = "calligra-2.8.7"; @@ -14,12 +14,13 @@ stdenv.mkDerivation rec { sha256 = "1d8fx0xn8n8y6jglw8hhpk7kr6kbhsbaxqwqlfzmnzh7x9s8nsxg"; }; - nativeBuildInputs = [ cmake perl pkgconfig ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; # TODO: package Vc, libWPS, Spnav, m2mml, LibEtonyek, poppler-qt4-xpdf-headers # not found: xbase, openjpeg(too new) - buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs + buildInputs = [ + kdelibs attica zlib libpng boost mesa kdepimlibs createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype sqlite icu libwpd libwpg poppler_qt4 libkdcraw libxslt fftw glew gsl shared_desktop_ontologies okular libodfgen opencolorio openjpeg diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix index c260220aad4..395cb3d0a91 100644 --- a/pkgs/applications/office/eventlist/default.nix +++ b/pkgs/applications/office/eventlist/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, kdelibs, kdepimlibs, akonadi, gettext, boost }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, kdepimlibs, akonadi, boost }: stdenv.mkDerivation rec { name = "plasmoid-eventlist-0.6.96"; @@ -8,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "26cc7bd1c465bf1379fd0ba1fa8592eaa62f2553734d1b283e17359103908eea"; }; - buildInputs = [ kdelibs kdepimlibs akonadi gettext boost ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; + buildInputs = [ kdelibs kdepimlibs akonadi boost ]; meta = { inherit (kdelibs.meta) platforms; diff --git a/pkgs/applications/office/kbibtex/default.nix b/pkgs/applications/office/kbibtex/default.nix index b3e62b8e051..a18ba50cabe 100644 --- a/pkgs/applications/office/kbibtex/default.nix +++ b/pkgs/applications/office/kbibtex/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, kdelibs, libxslt, poppler_qt4 }: +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig +, kdelibs, libxslt, poppler_qt4 +}: stdenv.mkDerivation rec { pname = "kbibtex"; @@ -15,4 +17,5 @@ stdenv.mkDerivation rec { ''; buildInputs = [ kdelibs libxslt poppler_qt4 ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; } diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index 52dd08e1e0d..712725f5275 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, libxslt, kdelibs, kdepimlibs, grantlee, qjson, qca2, libofx, sqlite, gettext, boost }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig, shared_mime_info +, libxslt, kdelibs, kdepimlibs, grantlee, qjson, qca2, libofx, sqlite, boost }: stdenv.mkDerivation rec { name = "skrooge-1.10.0"; @@ -10,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxslt kdelibs kdepimlibs grantlee qjson qca2 libofx sqlite boost ]; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig shared_mime_info ]; meta = { inherit (kdelibs.meta) platforms; diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index 12334288254..7ae758d7e4f 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, kdelibs, kdepimlibs, boost }: +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig +, kdelibs, kdepimlibs, boost }: stdenv.mkDerivation rec { name = "zanshin-0.2.1"; @@ -8,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "155k72vk7kw0p0x9dhlky6q017kanzcbwvp4dpf1hcbr1dsr55fx"; }; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + buildInputs = [ kdelibs kdepimlibs boost ]; meta = { diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index 60f5d8bb9e0..b94978bb488 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db, kdelibs, expat }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, apr, aprutil, subversion, db, kdelibs, expat +}: # the homepage mentions this is the final release. # from now on, kdesvn will be part of the official kde software distribution @@ -16,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ apr aprutil subversion db kdelibs expat ]; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; meta = { description = "KDE SVN front-end"; diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix index f962b52dd62..ceece8879dc 100644 --- a/pkgs/applications/video/bangarang/default.nix +++ b/pkgs/applications/video/bangarang/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, soprano, shared_desktop_ontologies, kdemultimedia, taglib, glibc, gettext }: +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig +, kdelibs, phonon, soprano, shared_desktop_ontologies +, kdemultimedia, taglib, glibc, gettext +}: + stdenv.mkDerivation rec { name = "bangarang-2.1"; @@ -7,8 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1g4pap79k8qaqi0py34xqvisxln1nc5hbvph692ah3af06n6cly1"; }; - buildInputs = [ kdelibs phonon soprano shared_desktop_ontologies kdemultimedia taglib gettext ]; - nativeBuildInputs = [ cmake ]; + buildInputs = [ + kdelibs phonon soprano shared_desktop_ontologies kdemultimedia + taglib gettext + ]; + + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; patches = [ ./gcc-4.7.patch ]; diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix index 70558eb39a4..047f2301185 100644 --- a/pkgs/applications/video/k9copy/default.nix +++ b/pkgs/applications/video/k9copy/default.nix @@ -1,5 +1,9 @@ -{ stdenv, fetchurl, cmake, automoc4, qt5, kf5, dvdauthor, xineLib, libmpeg2, libav, -libdvdread, libdvdnav, dvdplusrwtools, phonon_qt5 }: +{ stdenv, fetchurl +, cmake, automoc4 +, dvdauthor, xineLib, libmpeg2, libav, libdvdread, libdvdnav, dvdplusrwtools +, phonon, qtx11extras +, extra-cmake-modules, kio, kiconthemes, ki18n, kdesu, kdoctools, solid +}: stdenv.mkDerivation rec { version = "3.0.3"; @@ -30,18 +34,17 @@ stdenv.mkDerivation rec { libdvdread libdvdnav dvdplusrwtools - automoc4 - phonon_qt5 - ] ++ (with kf5; [ + #automoc4 + phonon extra-cmake-modules kio solid - qt5.x11extras + qtx11extras kiconthemes ki18n kdesu - kdoctools - ]); + ]; + nativeBuildInputs = [ kdoctools ]; meta = { description = "DVD backup and DVD authoring program"; diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index f29ad00ea9e..3da5180352c 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -14,9 +14,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ - automoc4 cmake frei0r gettext kdelibs libv4l makeWrapper mlt perl - phonon pkgconfig qimageblitz qjson qt4 shared_desktop_ontologies - shared_mime_info soprano + frei0r kdelibs libv4l mlt phonon qimageblitz qjson qt4 + shared_desktop_ontologies soprano + ]; + + nativeBuildInputs = [ + automoc4 cmake gettext makeWrapper perl pkgconfig shared_mime_info ]; propagatedUserEnvPkgs = [ oxygen_icons ]; diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 8d4a328cc09..2e62cb139e3 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gettext, makeWrapper +{ stdenv, fetchurl +, automoc4, cmake, gettext, makeWrapper, perl, pkgconfig , kdelibs, cairo, dbus_glib, mplayer }: @@ -11,10 +12,9 @@ stdenv.mkDerivation { sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky"; }; - buildInputs = [ - cmake gettext pkgconfig makeWrapper - kdelibs cairo dbus_glib - ]; + buildInputs = [ kdelibs cairo dbus_glib ]; + + nativeBuildInputs = [ automoc4 cmake gettext makeWrapper perl pkgconfig ]; postInstall = '' wrapProgram $out/bin/kmplayer --suffix PATH : ${mplayer}/bin diff --git a/pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch b/pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch new file mode 100644 index 00000000000..cd19b7e2d72 --- /dev/null +++ b/pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch @@ -0,0 +1,36 @@ +From 38f35dcec38458f7192424b3d63bc0c614bb86e0 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 7 Sep 2015 18:55:44 -0500 +Subject: [PATCH] ksysguard disable signalplottertest + +--- + libs/ksysguard/tests/CMakeLists.txt | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/libs/ksysguard/tests/CMakeLists.txt b/libs/ksysguard/tests/CMakeLists.txt +index d472fd7..f178b71 100644 +--- a/libs/ksysguard/tests/CMakeLists.txt ++++ b/libs/ksysguard/tests/CMakeLists.txt +@@ -14,19 +14,3 @@ target_link_libraries(processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIB + set( signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp) + kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplottertest ${signalplotterbenchmark_SRCS} ) + target_link_libraries( signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} ) +- +- +-# KGraphicsSignalPlotter benchmark +-set( graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp) +-kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-signalplottertest ${graphicssignalplotterbenchmark_SRCS} ) +-target_link_libraries( graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} ) +- +- +-# KSignalPlotter unit test +-set( signalplottertest_SRCS signalplottertest.cpp ../signalplotter/ksignalplotter.cpp) +-kde4_add_unit_test( signalplottertest TESTNAME ksysguard-signalplottertest ${signalplottertest_SRCS} ) +-target_link_libraries( signalplottertest ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ) +- +- +- +- +-- +2.5.0 + diff --git a/pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch b/pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch new file mode 100644 index 00000000000..4127b16d5f6 --- /dev/null +++ b/pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch @@ -0,0 +1,62 @@ +From 93081f817f20bbc26b55e1b37b22d60535d153f7 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Thu, 10 Sep 2015 18:41:57 -0500 +Subject: [PATCH] duplicate add_test + +--- + RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt | 1 - + RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt | 1 - + RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt | 1 - + RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt | 1 - + RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt | 1 - + 5 files changed, 5 deletions(-) + +diff --git a/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt +index 32a2504..4fbb838 100644 +--- a/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt ++++ b/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt +@@ -33,4 +33,3 @@ target_link_libraries(TestDotFileFormatPlugin + ${QT_QTTEST_LIBRARY} + ${KDE4_KDECORE_LIBS} + ) +-add_test(TestDotFileFormatPlugin TestDotFileFormatPlugin) +diff --git a/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt +index 615004c..6383bd8 100644 +--- a/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt ++++ b/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt +@@ -32,4 +32,3 @@ target_link_libraries(TestGmlFileFormatPlugin + ${QT_QTTEST_LIBRARY} + ${KDE4_KDECORE_LIBS} + ) +-add_test(TestGmlFileFormatPlugin TestGmlFileFormatPlugin) +diff --git a/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt +index f9cdbfa..842d14b 100644 +--- a/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt ++++ b/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt +@@ -30,4 +30,3 @@ target_link_libraries(TestKmlFileFormatPlugin + ${QT_QTTEST_LIBRARY} + ${KDE4_KDECORE_LIBS} + ) +-add_test(TestKmlFileFormatPlugin TestKmlFileFormatPlugin) +diff --git a/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt +index 33c0da8..70cab8d 100644 +--- a/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt ++++ b/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt +@@ -35,4 +35,3 @@ target_link_libraries(TestTgfFileFormatPlugin + ${QT_QTTEST_LIBRARY} + ${KDE4_KDECORE_LIBS} + ) +-add_test(TestTgfFileFormatPlugin TestTgfFileFormatPlugin) +diff --git a/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt +index b52736e..58ee40e 100644 +--- a/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt ++++ b/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt +@@ -29,5 +29,4 @@ target_link_libraries(TestTikzFileFormatPlugin + ${QT_QTTEST_LIBRARY} + ${KDE4_KDECORE_LIBS} + ) +-add_test(TestTikzFileFormatPlugin TestTikzFileFormatPlugin) + +-- +2.5.0 + diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix index c78dfbd8a36..52600e183bd 100644 --- a/pkgs/desktops/kde-4.14/kde-package/default.nix +++ b/pkgs/desktops/kde-4.14/kde-package/default.nix @@ -1,4 +1,4 @@ -{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4 +{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4, perl, pkgconfig , release, branch, ignoreList, extraSubpkgs }: @@ -29,13 +29,14 @@ rec { # released as individual tarballs kdeMonoPkg = name: let n_ = name; v_ = getAttr name manifest.versions; in - a@{meta, name ? n_, version ? v_, ...}: + a@{meta, name ? n_, version ? v_, nativeBuildInputs ? [], ...}: stdenv.mkDerivation ({ name = "${name}-${version}"; src = kdesrc name version; + nativeBuildInputs = nativeBuildInputs ++ [ automoc4 cmake perl pkgconfig ]; meta = defMeta // meta; enableParallelBuilding = true; - } // (removeAttrs a [ "meta" "name" ])); + } // (removeAttrs a [ "meta" "name" "nativeBuildInputs" ])); # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs # API. @@ -45,10 +46,11 @@ rec { kdeSubdirPkg = module: {name, subdir ? name, sane ? name}: let name_ = name; version_ = getAttr module manifest.versions; in - a@{cmakeFlags ? [], name ? name_, version ? version_, meta ? {}, ...}: + a@{cmakeFlags ? [], name ? name_, version ? version_, meta ? {}, nativeBuildInputs ? [], ...}: stdenv.mkDerivation ({ name = "${name}-${release}"; src = kdesrc module version; + nativeBuildInputs = nativeBuildInputs ++ [ automoc4 cmake perl pkgconfig ]; cmakeFlags = [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE" "-DBUILD_doc=TRUE" @@ -56,7 +58,7 @@ rec { ] ++ cmakeFlags; meta = defMeta // meta; enableParallelBuilding = module.enableParallelBuilding or true; - } // (removeAttrs a [ "meta" "name" "cmakeFlags" ])); + } // (removeAttrs a [ "meta" "name" "cmakeFlags" "nativeBuildInputs" ])); # A KDE monolithic module kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; }; diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix index ddda04fd370..ae495966262 100644 --- a/pkgs/desktops/kde-4.14/kde-runtime.nix +++ b/pkgs/desktops/kde-4.14/kde-runtime.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2 +{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2, shared_mime_info , libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio , networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme }: @@ -14,7 +14,7 @@ kde { #todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ shared_mime_info ]; NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; diff --git a/pkgs/desktops/kde-4.14/kde-workspace.nix b/pkgs/desktops/kde-4.14/kde-workspace.nix index 75863e1fe99..53df146ab53 100644 --- a/pkgs/desktops/kde-4.14/kde-workspace.nix +++ b/pkgs/desktops/kde-4.14/kde-workspace.nix @@ -18,7 +18,7 @@ kde { kactivities ]; - nativeBuildInputs = [ pkgconfig ]; + patches = [ ./files/ksysguard-0001-disable-signalplottertest.patch ]; preConfigure = '' diff --git a/pkgs/desktops/kde-4.14/kdeedu/rocs.nix b/pkgs/desktops/kde-4.14/kdeedu/rocs.nix index ce30d11fda3..76131d8f0f0 100644 --- a/pkgs/desktops/kde-4.14/kdeedu/rocs.nix +++ b/pkgs/desktops/kde-4.14/kdeedu/rocs.nix @@ -1,6 +1,8 @@ { kde, kdelibs, boost, grantlee }: kde { + patches = [ ../files/rocs-0001-duplicate-add_test.patch ]; + buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) grantlee ]; NIX_CFLAGS_COMPILE = "-fexceptions"; diff --git a/pkgs/desktops/kde-4.14/kdegames/kpat.nix b/pkgs/desktops/kde-4.14/kdegames/kpat.nix index f8d9bad36dc..b60afa786d1 100644 --- a/pkgs/desktops/kde-4.14/kdegames/kpat.nix +++ b/pkgs/desktops/kde-4.14/kdegames/kpat.nix @@ -1,6 +1,7 @@ -{ kde, kdelibs, libkdegames }: +{ kde, kdelibs, libkdegames, shared_mime_info }: kde { buildInputs = [ kdelibs libkdegames ]; + nativeBuildInputs = [ shared_mime_info ]; meta = { description = "a relaxing card sorting game"; }; diff --git a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix b/pkgs/desktops/kde-4.14/kdegames/palapeli.nix index 010dbd5d623..ddecc78c75b 100644 --- a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix +++ b/pkgs/desktops/kde-4.14/kdegames/palapeli.nix @@ -1,8 +1,10 @@ -{ kde, kdelibs, libkdegames }: +{ kde, kdelibs, libkdegames, shared_mime_info }: kde { # TODO: package qvoronoi + nativeBuildInputs = [ shared_mime_info ]; + buildInputs = [ kdelibs libkdegames ]; meta = { diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix index 1d5c6e2fcb4..18697e13b66 100644 --- a/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix +++ b/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix @@ -4,8 +4,6 @@ kde { buildInputs = [ kdelibs libraw lcms2 ]; - nativeBuildInputs = [ pkgconfig ]; - meta = { description = "Library for decoding RAW images"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix index 526ac069e61..b990628889b 100644 --- a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix +++ b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix @@ -1,5 +1,5 @@ { stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, poppler_qt4 -, pkgconfig, doxygen, ebook_tools +, pkgconfig, doxygen, ebook_tools, automoc4, cmake, perl }: kde { @@ -11,7 +11,7 @@ kde { poppler_qt4 ebook_tools ]; - nativeBuildInputs = [ pkgconfig doxygen ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig doxygen ]; meta = { description = "NEPOMUK core"; diff --git a/pkgs/desktops/kde-4.14/kdepim-runtime.nix b/pkgs/desktops/kde-4.14/kdepim-runtime.nix index d92e2254820..e5061a8790a 100644 --- a/pkgs/desktops/kde-4.14/kdepim-runtime.nix +++ b/pkgs/desktops/kde-4.14/kdepim-runtime.nix @@ -1,4 +1,5 @@ -{ kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies }: +{ kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies +, shared_mime_info }: kde { @@ -9,6 +10,8 @@ kde { libxslt ]; + nativeBuildInputs = [ shared_mime_info ]; + meta = { description = "KDE PIM runtime"; license = "GPL"; diff --git a/pkgs/desktops/kde-4.14/kdepimlibs.nix b/pkgs/desktops/kde-4.14/kdepimlibs.nix index e0f355acdd9..ac62c970eec 100644 --- a/pkgs/desktops/kde-4.14/kdepimlibs.nix +++ b/pkgs/desktops/kde-4.14/kdepimlibs.nix @@ -1,13 +1,20 @@ { kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison , kdelibs, akonadi, libxslt, nepomuk_core -, shared_desktop_ontologies, qjson }: +, shared_mime_info, shared_desktop_ontologies, qjson +, automoc4, cmake, perl +}: kde { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + + cmakeFlags = [ + "-DCMAKE_MINIMUM_REQUIRED_VERSION=3.3" + ]; buildInputs = [ boost gpgme libical libxslt qjson prison openldap cyrus_sasl akonadi shared_desktop_ontologies + shared_mime_info ]; propagatedBuildInputs = [ kdelibs nepomuk_core ]; diff --git a/pkgs/desktops/kde-4.14/kdeplasma-addons.nix b/pkgs/desktops/kde-4.14/kdeplasma-addons.nix index 2b1f1628cf1..b4d24f47e49 100644 --- a/pkgs/desktops/kde-4.14/kdeplasma-addons.nix +++ b/pkgs/desktops/kde-4.14/kdeplasma-addons.nix @@ -1,7 +1,7 @@ { kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig , boost, eigen2, kde_workspace, attica, qca2, qimageblitz , kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt -, qjson, qoauth }: +, qjson, qoauth, shared_mime_info }: kde { @@ -14,7 +14,7 @@ kde { shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ shared_mime_info ]; meta = { description = "KDE Plasma Addons"; diff --git a/pkgs/desktops/kde-4.14/kdesdk/okteta.nix b/pkgs/desktops/kde-4.14/kdesdk/okteta.nix index 058636596ad..77108c76adc 100644 --- a/pkgs/desktops/kde-4.14/kdesdk/okteta.nix +++ b/pkgs/desktops/kde-4.14/kdesdk/okteta.nix @@ -1,8 +1,10 @@ -{ kde, kdelibs, qca2 }: +{ kde, kdelibs, qca2, shared_mime_info }: kde { buildInputs = [ kdelibs qca2 ]; + nativeBuildInputs = [ shared_mime_info ]; + # TODO: Look what does -DBUILD_mobile add enableParallelBuilding = false; diff --git a/pkgs/desktops/kde-4.14/l10n/default.nix b/pkgs/desktops/kde-4.14/l10n/default.nix index fa6406043b1..b4c272cb328 100644 --- a/pkgs/desktops/kde-4.14/l10n/default.nix +++ b/pkgs/desktops/kde-4.14/l10n/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }: +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig +, kdelibs, gettext, release, branch, stable +}: let @@ -18,7 +20,11 @@ let buildInputs = [ gettext kdelibs ]; - cmakeFlags = "-Wno-dev"; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + + cmakeFlags = [ + "-Wno-dev" + ]; meta = { description = "KDE translation for ${lang}"; diff --git a/pkgs/development/libraries/libalkimia/default.nix b/pkgs/development/libraries/libalkimia/default.nix index d372c5cf8fc..bcb699da828 100644 --- a/pkgs/development/libraries/libalkimia/default.nix +++ b/pkgs/development/libraries/libalkimia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, kdelibs, gmpxx }: +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs, gmpxx }: stdenv.mkDerivation rec { name = "libalkimia-4.3.2"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { }; patchPhase = "sed -e 's/KDE4_DATA_DIR/DATA_INSTALL_DIR/' -i CMakeLists.txt"; - buildInputs = [ pkgconfig kdelibs gmpxx ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + buildInputs = [ kdelibs gmpxx ]; meta = { maintainers = [ stdenv.lib.maintainers.urkud ]; diff --git a/pkgs/development/libraries/libkvkontakte/default.nix b/pkgs/development/libraries/libkvkontakte/default.nix index 2a346abed74..152fe0894af 100644 --- a/pkgs/development/libraries/libkvkontakte/default.nix +++ b/pkgs/development/libraries/libkvkontakte/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchgit, pkgconfig, qjson, kdelibs }: +{ stdenv, fetchgit, automoc4, cmake, pkgconfig, qjson, kdelibs }: stdenv.mkDerivation { - name = "libkvkonatkte-1.0-pre20120103"; + name = "libkvkontakte-1.0-pre20120103"; src = fetchgit { url = git://anongit.kde.org/libkvkontakte; @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "0ryvjfrsws845k9s76715xid48y01h0ynb5wdx6ln8cm5z5wqj61"; }; - buildInputs = [ pkgconfig qjson kdelibs ]; + nativeBuildInputs = [ automoc4 cmake pkgconfig ]; + buildInputs = [ qjson kdelibs ]; meta = { homepage = https://projects.kde.org/projects/extragear/libs/libkvkontakte; diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix index e21f5ed15e9..7342b866a48 100644 --- a/pkgs/development/tools/analysis/massif-visualizer/default.nix +++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, kdelibs, kgraphviewer, gettext }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, kgraphviewer }: stdenv.mkDerivation rec { name = "massif-visualizer-${version}"; @@ -9,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "9940fa90137ca5eef08b9ec220825fadbf03db423a670a2c7fe3edab271d9922"; }; - buildInputs = [ kdelibs kgraphviewer gettext ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; + buildInputs = [ kdelibs kgraphviewer ]; meta = with stdenv.lib; { description = "Tool that visualizes massif data generated by valgrind"; diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix index 2aa73f1e0c1..cc11aab81cd 100644 --- a/pkgs/misc/themes/qtcurve/default.nix +++ b/pkgs/misc/themes/qtcurve/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, gettext, pkgconfig # Build tools +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig , gtk2, kde_workspace, kdelibs # Toolkit dependencies , libpthreadstubs, libXdmcp, libxcb, xorg # X11 dependencies }: @@ -10,9 +10,9 @@ stdenv.mkDerivation { sha256 = "19kk11hgi6md1cl0hr0pklcczbl66jczahlkf5fr8j59ljgpr6c5"; }; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; + buildInputs = [ - cmake - gettext gtk2 kde_workspace kdelibs diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix index 55260b269c6..606595f4605 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/tools/misc/colord-kde/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, cmake, colord, libX11, libXrandr, lcms2, pkgconfig, kdelibs}: +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig +, colord, libX11, libXrandr, lcms2, kdelibs +}: stdenv.mkDerivation { name = "colord-kde-0.3.0"; @@ -8,7 +10,9 @@ stdenv.mkDerivation { sha256 = "ab3cdb7c8c98aa2ee8de32a92f87770e1fbd58eade6471f3f24d932b50b4cf09"; }; - buildInputs = [ cmake colord libX11 libXrandr lcms2 pkgconfig kdelibs ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + + buildInputs = [ colord libX11 libXrandr lcms2 kdelibs ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/kde-gtk-config/default.nix b/pkgs/tools/misc/kde-gtk-config/default.nix index 88df0b6b544..809d0c65c6e 100644 --- a/pkgs/tools/misc/kde-gtk-config/default.nix +++ b/pkgs/tools/misc/kde-gtk-config/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, cmake, gettext, gtk2, gtk3, kdelibs -, libxcb, libpthreadstubs, libXdmcp, pkgconfig, glib, gdk_pixbuf }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, gtk2, gtk3, kdelibs, libxcb, libpthreadstubs, libXdmcp +, glib, gdk_pixbuf +}: stdenv.mkDerivation { name = "kde-gtk-config-2.2.1"; @@ -9,19 +11,11 @@ stdenv.mkDerivation { }; buildInputs = [ - cmake - gdk_pixbuf - gettext - glib - gtk2 - gtk3 - kdelibs - libxcb - libpthreadstubs - libXdmcp - pkgconfig + gdk_pixbuf glib gtk2 gtk3 kdelibs libxcb libpthreadstubs libXdmcp ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; + patches = [ ./kde-gtk-config-2.2.1-install-paths.patch ./kde-gtk-config-follow-symlinks.patch diff --git a/pkgs/tools/networking/plasma-nm/default.nix b/pkgs/tools/networking/plasma-nm/default.nix index 5d07e6c26ec..17f809ddb8c 100644 --- a/pkgs/tools/networking/plasma-nm/default.nix +++ b/pkgs/tools/networking/plasma-nm/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, cmake, gettext, kdelibs, networkmanager, libnm-qt }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, networkmanager, libnm-qt }: let pname = "plasma-nm"; @@ -13,14 +14,9 @@ stdenv.mkDerivation { sha256 = "0xj14isvjq8ll70b6q66n8adm8ff4j9ng195ndk2gmavjf6bb751"; }; - buildInputs = [ - cmake - pkgconfig - gettext - kdelibs - networkmanager - libnm-qt - ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; + + buildInputs = [ kdelibs networkmanager libnm-qt ]; meta = with stdenv.lib; { homepage = "https://projects.kde.org/projects/kde/workspace/plasma-nm"; diff --git a/pkgs/tools/security/ksshaskpass/default.nix b/pkgs/tools/security/ksshaskpass/default.nix index 1c777294c9b..a668f57c5bb 100644 --- a/pkgs/tools/security/ksshaskpass/default.nix +++ b/pkgs/tools/security/ksshaskpass/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, kdelibs}: +{ stdenv, fetchurl, kdelibs +, automoc4, cmake, perl, pkgconfig +}: stdenv.mkDerivation { name = "ksshaskpass-0.5.3"; @@ -8,6 +10,8 @@ stdenv.mkDerivation { sha256 = "0911i8jr0nzqah8xidb8wba55a2skaidj3klv3cw6bm5fjx7x953"; }; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + buildInputs = [ kdelibs ]; patchPhase = '' diff --git a/pkgs/tools/security/polkit-kde-agent/default.nix b/pkgs/tools/security/polkit-kde-agent/default.nix index b3990b53a87..6b4bcf7ad63 100644 --- a/pkgs/tools/security/polkit-kde-agent/default.nix +++ b/pkgs/tools/security/polkit-kde-agent/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, kdelibs, polkit_qt4, gettext }: +{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig +, kdelibs, polkit_qt4 }: stdenv.mkDerivation rec { name = "polkit-kde-agent-1-0.99.0"; @@ -10,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs polkit_qt4 ]; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; patchPhase = "sed -e s/KDE4_AUTOSTART/AUTOSTART/ -i CMakeLists.txt"; diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index eb8db0a44a5..664fb87b520 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, cmake, kdelibs, gettext }: +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig +, kdelibs, gettext +}: stdenv.mkDerivation rec { name = "kdiff3-0.9.98"; @@ -8,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ kdelibs ]; - nativeBuildInputs = [ cmake gettext ]; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; meta = { homepage = http://kdiff3.sourceforge.net/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 325efb2b70f..d493bc5f76c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13908,7 +13908,7 @@ let libusb = libusb1; libcanberra = libcanberra_kde; boost = boost155; - kdelibs = kdeApps_stable.kdelibs; + kdelibs = kdeApps_15_08.kdelibs; } ../desktops/kde-4.14; @@ -13933,10 +13933,7 @@ let colord-kde = callPackage ../tools/misc/colord-kde { }; - digikam = if builtins.compareVersions "4.9" kde4.release == 1 then - callPackage ../applications/graphics/digikam/2.nix { } - else - callPackage ../applications/graphics/digikam { }; + digikam = callPackage ../applications/graphics/digikam { }; eventlist = callPackage ../applications/office/eventlist {}; From fde78376e41f33063791e0c15a87ba6fa7d37a65 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:15:21 -0500 Subject: [PATCH 14/43] add kf5PackagesFun --- pkgs/top-level/all-packages.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d493bc5f76c..858c3b3402c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6632,10 +6632,6 @@ let lua = lua5_1; }; - k9copy = callPackage ../applications/video/k9copy { - kf5 = kf510; - }; - keybinder3 = callPackage ../development/libraries/keybinder3 { automake = automake111x; }; @@ -6646,6 +6642,14 @@ let kf5_stable = kf510; kf513 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.13 { inherit pkgs; }); + kf5PackagesFun = self: with self; { + + k9copy = callPackage ../applications/video/k9copy {}; + + }; + + kf513Packages = lib.makeScope kf513.newScope kf5PackagesFun; + kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; krb5Full = callPackage ../development/libraries/kerberos/krb5.nix { From cf4defce2cfa47be6921f5583ce04183bb3d6232 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:16:37 -0500 Subject: [PATCH 15/43] quassel: build with Qt 5.5 --- .../networking/irc/quassel/default.nix | 32 ++----- .../networking/irc/quassel/qt-5.nix | 91 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 73 +++++++-------- 3 files changed, 131 insertions(+), 65 deletions(-) create mode 100644 pkgs/applications/networking/irc/quassel/qt-5.nix diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 4cc54b9f812..9c77e6b133f 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -3,15 +3,12 @@ , client ? false # build Quassel client , previews ? false # enable webpage previews on hovering over URLs , tag ? "" # tag added to the package name -, useQt5 ? false, phonon_qt5, libdbusmenu_qt5, qca-qt5 , withKDE ? stdenv.isLinux # enable KDE integration -, kf5 ? null, kdelibs ? null +, kdelibs ? null , stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf, qca2 }: -let useKF5 = useQt5 && withKDE; - useKDE4 = withKDE && !useQt5; - buildClient = monolithic || client; +let buildClient = monolithic || client; buildCore = monolithic || daemon; in @@ -19,8 +16,7 @@ assert stdenv.isLinux; assert monolithic -> !client && !daemon; assert client || daemon -> !monolithic; -assert useKDE4 -> kdelibs != null; -assert useKF5 -> kf5 != null; +assert withKDE -> kdelibs != null; assert !buildClient -> !withKDE; # KDE is used by the client only let @@ -39,20 +35,9 @@ in with stdenv; mkDerivation rec { enableParallelBuilding = true; buildInputs = - [ cmake makeWrapper ] - ++ [(if useQt5 then qt.base else qt)] - ++ lib.optionals buildCore (if useQt5 then [qt.script qca-qt5] else [qca2]) - ++ lib.optionals buildClient - ( lib.optionals (previews && useQt5) [qt.webkit qt.webkitwidgets] - ++ lib.optionals useQt5 [libdbusmenu_qt5 phonon_qt5] - ++ lib.optionals useKDE4 [automoc4 kdelibs phonon] - ++ lib.optionals useKF5 - (with kf5; [ - extra-cmake-modules kconfigwidgets kcoreaddons - knotifications knotifyconfig ktextwidgets kwidgetsaddons - kxmlgui - ]) - ); + [ cmake makeWrapper qt ] + ++ lib.optionals buildCore [qca2] + ++ lib.optionals withKDE [automoc4 kdelibs phonon]; NIX_CFLAGS_COMPILE = "-fPIC"; @@ -63,8 +48,7 @@ in with stdenv; mkDerivation rec { ++ edf daemon "WANT_CORE" ++ edf client "WANT_QTCLIENT" ++ edf withKDE "WITH_KDE" - ++ edf previews "WITH_WEBKIT" - ++ edf useQt5 "USE_QT5"; + ++ edf previews "WITH_WEBKIT"; preFixup = lib.optionalString buildClient '' @@ -85,6 +69,6 @@ in with stdenv; mkDerivation rec { license = stdenv.lib.licenses.gpl3; maintainers = with maintainers; [ phreedom ttuegel ]; repositories.git = https://github.com/quassel/quassel.git; - inherit ((if useQt5 then qt.base else qt).meta) platforms; + inherit (qt.meta) platforms; }; } diff --git a/pkgs/applications/networking/irc/quassel/qt-5.nix b/pkgs/applications/networking/irc/quassel/qt-5.nix new file mode 100644 index 00000000000..8e75f16dbda --- /dev/null +++ b/pkgs/applications/networking/irc/quassel/qt-5.nix @@ -0,0 +1,91 @@ +{ monolithic ? true # build monolithic Quassel +, daemon ? false # build Quassel daemon +, client ? false # build Quassel client +, previews ? false # enable webpage previews on hovering over URLs +, tag ? "" # tag added to the package name + +, stdenv, fetchurl, cmake, makeWrapper, dconf +, qtbase, qtscript, qtwebkit +, phonon, libdbusmenu, qca-qt5 + +, withKDE ? stdenv.isLinux # enable KDE integration +, extra-cmake-modules +, kconfigwidgets +, kcoreaddons +, knotifications +, knotifyconfig +, ktextwidgets +, kwidgetsaddons +, kxmlgui +}: + +let + buildClient = monolithic || client; + buildCore = monolithic || daemon; +in + +assert stdenv.isLinux; + +assert monolithic -> !client && !daemon; +assert client || daemon -> !monolithic; +assert !buildClient -> !withKDE; # KDE is used by the client only + +let + edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))]; + +in with stdenv; mkDerivation rec { + + version = "0.12.2"; + name = "quassel${tag}-${version}"; + + src = fetchurl { + url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2"; + sha256 = "15vqjiw38mifvnc95bhvy0zl23xxldkwg2byx9xqbyw8rfgggmkb"; + }; + + enableParallelBuilding = true; + + buildInputs = + [ cmake makeWrapper qtbase ] + ++ lib.optionals buildCore [qtscript qca-qt5] + ++ lib.optionals buildClient [libdbusmenu phonon] + ++ lib.optionals (buildClient && previews) [qtwebkit] + ++ lib.optionals (buildClient && withKDE) [ + extra-cmake-modules kconfigwidgets kcoreaddons + knotifications knotifyconfig ktextwidgets kwidgetsaddons + kxmlgui + ]; + + cmakeFlags = [ + "-DEMBED_DATA=OFF" + "-DSTATIC=OFF" + "-DUSE_QT5=ON" + ] + ++ edf monolithic "WANT_MONO" + ++ edf daemon "WANT_CORE" + ++ edf client "WANT_QTCLIENT" + ++ edf withKDE "WITH_KDE" + ++ edf previews "WITH_WEBKIT"; + + preFixup = + lib.optionalString buildClient '' + wrapProgram "$out/bin/quassel${lib.optionalString client "client"}" \ + --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" + ''; + + meta = with stdenv.lib; { + homepage = http://quassel-irc.org/; + description = "Qt/KDE distributed IRC client suppporting a remote daemon"; + longDescription = '' + Quassel IRC is a cross-platform, distributed IRC client, + meaning that one (or multiple) client(s) can attach to + and detach from a central core -- much like the popular + combination of screen and a text-based IRC client such + as WeeChat, but graphical (based on Qt4/KDE4 or Qt5/KF5). + ''; + license = stdenv.lib.licenses.gpl3; + maintainers = with maintainers; [ phreedom ttuegel ]; + repositories.git = https://github.com/quassel/quassel.git; + inherit (qtbase.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 858c3b3402c..4875ceb22fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6646,6 +6646,38 @@ let k9copy = callPackage ../applications/video/k9copy {}; + quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix { + monolithic = true; + daemon = false; + client = false; + withKDE = true; + dconf = gnome3.dconf; + tag = "-kf5"; + }; + + quasselClient = quassel.override { + monolithic = false; + client = true; + tag = "-client-kf5"; + }; + + quassel_qt5 = quassel.override { + withKDE = false; + tag = "-qt5"; + }; + + quasselClient_qt5 = quasselClient.override { + withKDE = false; + tag = "-client-qt5"; + }; + + quasselDaemon = quassel.override { + monolithic = false; + daemon = true; + tag = "-daemon-qt5"; + withKDE = false; + }; + }; kf513Packages = lib.makeScope kf513.newScope kf5PackagesFun; @@ -12445,47 +12477,6 @@ let qtractor = callPackage ../applications/audio/qtractor { }; - quassel_qt5 = callPackage ../applications/networking/irc/quassel { - monolithic = true; - daemon = false; - client = false; - withKDE = false; - useQt5 = true; - qt = qt5; - dconf = gnome3.dconf; - tag = "-qt5"; - }; - - quasselClient_qt5 = quassel_qt5.override { - monolithic = false; - client = true; - tag = "-client-qt5"; - }; - - quasselDaemon_qt5 = quassel_qt5.override { - monolithic = false; - daemon = true; - tag = "-daemon-qt5"; - }; - - quassel_kf5 = callPackage ../applications/networking/irc/quassel { - monolithic = true; - daemon = false; - client = false; - withKDE = true; - useQt5 = true; - qt = qt5; - kf5 = kf510; - dconf = gnome3.dconf; - tag = "-kf5"; - }; - - quasselClient_kf5 = quassel_kf5.override { - monolithic = false; - client = true; - tag = "-client-kf5"; - }; - quirc = callPackage ../tools/graphics/quirc {}; quodlibet = callPackage ../applications/audio/quodlibet { From 078d54400583114b5ff36b69ed455a53a918a6fd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:18:12 -0500 Subject: [PATCH 16/43] libdbusmenu-qt5: build with Qt 5.5 --- .../libdbusmenu-qt/{qt5.nix => qt-5.4.nix} | 0 .../libraries/libdbusmenu-qt/qt-5.5.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++- 3 files changed, 27 insertions(+), 1 deletion(-) rename pkgs/development/libraries/libdbusmenu-qt/{qt5.nix => qt-5.4.nix} (100%) create mode 100644 pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.4.nix similarity index 100% rename from pkgs/development/libraries/libdbusmenu-qt/qt5.nix rename to pkgs/development/libraries/libdbusmenu-qt/qt-5.4.nix diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix new file mode 100644 index 00000000000..e2ce87c2d66 --- /dev/null +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchbzr, cmake, qtbase }: + +stdenv.mkDerivation { + name = "libdbusmenu-qt-0.9.3+14"; + + src = fetchbzr { + url = "http://bazaar.launchpad.net/~dbusmenu-team/libdbusmenu-qt/trunk"; + rev = "ps-jenkins@lists.canonical.com-20140619090718-mppiiax5atpnb8i2"; + sha256 = "1dbhaljyivbv3wc184zpjfjmn24zb6aj72wgg1gg1xl5f783issd"; + }; + + buildInputs = [ qtbase ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = "-DWITH_DOC=OFF"; + + meta = with stdenv.lib; { + homepage = "http://launchpad.net/libdbusmenu-qt"; + description = "Provides a Qt implementation of the DBusMenu spec"; + maintainers = [ maintainers.ttuegel ]; + inherit (qt5.base.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4875ceb22fc..b469a51f36d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6835,7 +6835,8 @@ let }; libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { }; - libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt5.nix { }; + + libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt-5.4.nix { }; libdc1394 = callPackage ../development/libraries/libdc1394 { }; @@ -7935,6 +7936,8 @@ let qt5LibsFun = self: with self; { + libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { }; + phonon = callPackage ../development/libraries/phonon/qt5 { }; phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { }; From 38461f18c3eea43fc876c58ed4e4ea9fdced97ec Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:20:26 -0500 Subject: [PATCH 17/43] signon: build with Qt 5.5 --- pkgs/development/libraries/signon/default.nix | 4 ++-- pkgs/development/libraries/signon/old.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++-- 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/signon/old.nix diff --git a/pkgs/development/libraries/signon/default.nix b/pkgs/development/libraries/signon/default.nix index 7b3defb8a58..d33edf9726f 100644 --- a/pkgs/development/libraries/signon/default.nix +++ b/pkgs/development/libraries/signon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, doxygen, qt5 }: +{ stdenv, fetchzip, doxygen, qtbase }: stdenv.mkDerivation rec { name = "signon-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0q1ncmp27jrwbjkqisf0l63zzpw6bcsx5i4y86xixh8wd5arj87a"; }; - buildInputs = [ qt5.base ]; + buildInputs = [ qtbase ]; nativeBuildInputs = [ doxygen ]; configurePhase = '' diff --git a/pkgs/development/libraries/signon/old.nix b/pkgs/development/libraries/signon/old.nix new file mode 100644 index 00000000000..7b3defb8a58 --- /dev/null +++ b/pkgs/development/libraries/signon/old.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchzip, doxygen, qt5 }: + +stdenv.mkDerivation rec { + name = "signon-${version}"; + version = "8.57"; + src = fetchzip { + url = "http://signond.accounts-sso.googlecode.com/archive/${version}.zip"; + sha256 = "0q1ncmp27jrwbjkqisf0l63zzpw6bcsx5i4y86xixh8wd5arj87a"; + }; + + buildInputs = [ qt5.base ]; + nativeBuildInputs = [ doxygen ]; + + configurePhase = '' + qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/SignOnQt5 + ''; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b469a51f36d..bfcfb409cf4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7956,6 +7956,8 @@ let qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + signon = callPackage ../development/libraries/signon { }; + vlc = callPackage ../applications/video/vlc { qt4 = null; withQt5 = true; @@ -8117,6 +8119,8 @@ let sfml = callPackage ../development/libraries/sfml { }; + signon = callPackage ../development/libraries/signon/old.nix {}; + skalibs = callPackage ../development/libraries/skalibs { }; slang = callPackage ../development/libraries/slang { }; @@ -8147,8 +8151,6 @@ let soundtouch = callPackage ../development/libraries/soundtouch {}; - signon = callPackage ../development/libraries/signon { }; - spandsp = callPackage ../development/libraries/spandsp {}; spatialite_tools = callPackage ../development/libraries/spatialite-tools { }; From 3d6110d2217f40225debc2f1902b0f22142e6f66 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:20:47 -0500 Subject: [PATCH 18/43] deprecate kde414.networkmanagement --- .../networking/networkmanagement/default.nix | 27 ------------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/tools/networking/networkmanagement/default.nix diff --git a/pkgs/tools/networking/networkmanagement/default.nix b/pkgs/tools/networking/networkmanagement/default.nix deleted file mode 100644 index 1c3191f3bf5..00000000000 --- a/pkgs/tools/networking/networkmanagement/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, gettext, kdelibs, kde_workspace, networkmanager, pkgconfig }: - -let - pname = "networkmanagement"; - version = "0.9.0.9"; - name = "${pname}-${version}"; -in -stdenv.mkDerivation { - inherit name; - - src = fetchurl { - url = "mirror://kde/unstable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "1jiij9iz8v9mgcq811svmlyfvmvkazpclkf4yk7193m4y8yn19yn"; - }; - - buildInputs = [ kdelibs kde_workspace networkmanager ]; - nativeBuildInputs = [ gettext pkgconfig ]; - - NIX_CFLAGS_COMPILE="-I${kde_workspace}/include/solid/control"; - - meta = { - homepage = https://projects.kde.org/projects/extragear/base/networkmanagement; - description = "KDE Plasmoid for controlling NetworkManager"; - inherit (kdelibs.meta) platforms; - maintainers = [ stdenv.lib.maintainers.urkud ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfcfb409cf4..600184c77ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14003,7 +14003,7 @@ let massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { }; - networkmanagement = callPackage ../tools/networking/networkmanagement { }; + networkmanagement = builtins.trace "`kde4.networkmanagement' is replaced by `kde4.plasma-nm', please update your configuration" plasma-nm; partitionManager = callPackage ../tools/misc/partition-manager { }; From 4a3d7eae7ee878db12b982b9aa7ac2e1f3dcf72d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:21:30 -0500 Subject: [PATCH 19/43] qmltermwidget: build with Qt 5.5 --- pkgs/development/libraries/qmltermwidget/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 9c657ec52d7..4d12f020d1e 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, qt5 }: +{ stdenv, fetchgit, qtbase, qtquick1 }: stdenv.mkDerivation rec { version = "0.1.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "19pz27jsdpa3pybj8sghmmd1zqgr73js1mp3875rhx158dav37nz"; }; - buildInputs = [ qt5.base qt5.quick1 ]; + buildInputs = [ qtbase qtquick1 ]; patchPhase = '' substituteInPlace qmltermwidget.pro \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 600184c77ba..79878289088 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7900,8 +7900,6 @@ let qjson = callPackage ../development/libraries/qjson { }; - qmltermwidget = callPackage ../development/libraries/qmltermwidget { }; - qoauth = callPackage ../development/libraries/qoauth { }; quazip = callPackage ../development/libraries/quazip { @@ -7956,6 +7954,8 @@ let qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + qmltermwidget = callPackage ../development/libraries/qmltermwidget { }; + signon = callPackage ../development/libraries/signon { }; vlc = callPackage ../applications/video/vlc { From dfbcab342a7c320c1f204d7309be4b474c9f5a17 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:22:39 -0500 Subject: [PATCH 20/43] accounts-qt: build with Qt 5.5 --- .../libraries/accounts-qt/default.nix | 4 +-- .../development/libraries/accounts-qt/old.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++-- 3 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/accounts-qt/old.nix diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index 26a04362090..315aab074e5 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qt5 }: +{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase }: let version = "1.13"; in stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ glib libaccounts-glib qt5.base ]; + buildInputs = [ glib libaccounts-glib qtbase ]; nativeBuildInputs = [ doxygen pkgconfig ]; configurePhase = '' diff --git a/pkgs/development/libraries/accounts-qt/old.nix b/pkgs/development/libraries/accounts-qt/old.nix new file mode 100644 index 00000000000..26a04362090 --- /dev/null +++ b/pkgs/development/libraries/accounts-qt/old.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qt5 }: + +let version = "1.13"; in +stdenv.mkDerivation { + name = "accounts-qt-${version}"; + + src = fetchFromGitLab { + sha256 = "1gpkgw05dwsf2wk5cy3skgss3kw6mqh7iv3fadrxqxfc1za1xmyl"; + rev = version; + repo = "libaccounts-qt"; + owner = "accounts-sso"; + }; + + meta = with stdenv.lib; { + description = "Qt library for accessing the online accounts database"; + homepage = "http://code.google.com/p/accounts-sso/"; + license = licenses.lgpl21; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ glib libaccounts-glib qt5.base ]; + nativeBuildInputs = [ doxygen pkgconfig ]; + + configurePhase = '' + qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79878289088..3db43923e24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5843,10 +5843,10 @@ let accelio = callPackage ../development/libraries/accelio { stdenv = overrideCC stdenv gcc5; }; - accounts-qt = callPackage ../development/libraries/accounts-qt { }; - accountsservice = callPackage ../development/libraries/accountsservice { }; + accounts-qt = callPackage ../development/libraries/accounts-qt/old.nix {}; + acl = callPackage ../development/libraries/acl { }; activemq = callPackage ../development/libraries/apache-activemq { }; @@ -7934,6 +7934,8 @@ let qt5LibsFun = self: with self; { + accounts-qt = callPackage ../development/libraries/accounts-qt { }; + libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { }; phonon = callPackage ../development/libraries/phonon/qt5 { }; From 569316e4fc967da1ebd7d22f70552e0e5734534a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:23:10 -0500 Subject: [PATCH 21/43] grantlee: build with Qt 5.5 --- .../libraries/grantlee/5.x-old.nix | 32 +++++++++++++++++++ pkgs/development/libraries/grantlee/5.x.nix | 5 +-- pkgs/top-level/all-packages.nix | 4 ++- 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/grantlee/5.x-old.nix diff --git a/pkgs/development/libraries/grantlee/5.x-old.nix b/pkgs/development/libraries/grantlee/5.x-old.nix new file mode 100644 index 00000000000..4127280fb9a --- /dev/null +++ b/pkgs/development/libraries/grantlee/5.x-old.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, qt5, cmake }: + +stdenv.mkDerivation rec { + name = "grantlee-5.0.0"; + +# Upstream download server has country code firewall, so I made a mirror. + src = fetchurl { + urls = [ + "http://downloads.grantlee.org/${name}.tar.gz" + "http://www.loegria.net/grantlee/${name}.tar.gz" + ]; + sha256 = "0qdifp1sg87j3869xva5ai2d6d5ph7z4b85wv1fypf2k5sljpwpa"; + }; + + buildInputs = [ cmake qt5.base qt5.script ]; + + meta = { + description = "Qt5 port of Django template system"; + longDescription = '' + Grantlee is a plugin based String Template system written using the Qt + framework. The goals of the project are to make it easier for application + developers to separate the structure of documents from the data they + contain, opening the door for theming. + + The syntax is intended to follow the syntax of the Django template system, + and the design of Django is reused in Grantlee.''; + + homepage = http://gitorious.org/grantlee; + maintainers = [ stdenv.lib.maintainers.urkud ]; + inherit (qt5.base.meta) platforms; + }; +} diff --git a/pkgs/development/libraries/grantlee/5.x.nix b/pkgs/development/libraries/grantlee/5.x.nix index 4127280fb9a..3323cbaeb4c 100644 --- a/pkgs/development/libraries/grantlee/5.x.nix +++ b/pkgs/development/libraries/grantlee/5.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt5, cmake }: +{ stdenv, fetchurl, qtbase, qtscript, cmake }: stdenv.mkDerivation rec { name = "grantlee-5.0.0"; @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0qdifp1sg87j3869xva5ai2d6d5ph7z4b85wv1fypf2k5sljpwpa"; }; - buildInputs = [ cmake qt5.base qt5.script ]; + buildInputs = [ qtbase qtscript ]; + nativeBuildInputs = [ cmake ]; meta = { description = "Qt5 port of Django template system"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3db43923e24..6b83bc00bf9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6424,7 +6424,7 @@ let grantlee = callPackage ../development/libraries/grantlee { }; - grantlee5 = callPackage ../development/libraries/grantlee/5.x.nix { }; + grantlee5 = callPackage ../development/libraries/grantlee/5.x-old.nix { }; gsasl = callPackage ../development/libraries/gsasl { }; @@ -7936,6 +7936,8 @@ let accounts-qt = callPackage ../development/libraries/accounts-qt { }; + grantlee = callPackage ../development/libraries/grantlee/5.x.nix { }; + libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { }; phonon = callPackage ../development/libraries/phonon/qt5 { }; From e745467726103b462ea1ffe6fcfb8ab8ac18425c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:23:39 -0500 Subject: [PATCH 22/43] libkeyfinder: build with Qt 5.5 --- pkgs/development/libraries/libkeyfinder/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index 12c360b3263..ca3e7949c1c 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, qt5 }: +{ stdenv, fetchFromGitHub, fftw, qtbase }: let version = "2.1"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ fftw qt5.base ]; + buildInputs = [ fftw qtbase ]; postPatch = '' substituteInPlace LibKeyFinder.pro \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b83bc00bf9..d96be03f16d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7137,8 +7137,6 @@ let libkate = callPackage ../development/libraries/libkate { }; - libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; - libksba = callPackage ../development/libraries/libksba { }; libksi = callPackage ../development/libraries/libksi { }; @@ -7940,6 +7938,8 @@ let libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { }; + libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; + phonon = callPackage ../development/libraries/phonon/qt5 { }; phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { }; From e462bdce89b792a4e311e514ce7947123eac3c55 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:24:16 -0500 Subject: [PATCH 23/43] openbr: build with Qt 5.5 --- pkgs/development/libraries/openbr/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix index 447b5e45dfb..2b4d11919fb 100644 --- a/pkgs/development/libraries/openbr/default.nix +++ b/pkgs/development/libraries/openbr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, opencv, qt5 }: +{ stdenv, fetchgit, cmake, opencv, qtbase, qtsvg }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16b3mmsf9r1yqqaw89fx0c3bgfg86dz4phry89wqy2hw05szgda3"; }; - buildInputs = [ opencv qt5.base qt5.svg ]; + buildInputs = [ opencv qtbase qtsvg ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d96be03f16d..745ec5bb709 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7704,8 +7704,6 @@ let openbabel = callPackage ../development/libraries/openbabel { }; - openbr = callPackage ../development/libraries/openbr { }; - opencascade = callPackage ../development/libraries/opencascade { tcl = tcl-8_5; tk = tk-8_5; @@ -7940,6 +7938,8 @@ let libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; + openbr = callPackage ../development/libraries/openbr { }; + phonon = callPackage ../development/libraries/phonon/qt5 { }; phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { }; From 9e3b22d25ab88faccad53d3abe0e3a254834b9c3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:24:55 -0500 Subject: [PATCH 24/43] telepathy_qt5: build with Qt 5.5 --- .../libraries/telepathy/qt5/default.nix | 4 +-- .../libraries/telepathy/qt5/old.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 3 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/telepathy/qt5/old.nix diff --git a/pkgs/development/libraries/telepathy/qt5/default.nix b/pkgs/development/libraries/telepathy/qt5/default.nix index 50d569f3091..1c18e844689 100644 --- a/pkgs/development/libraries/telepathy/qt5/default.nix +++ b/pkgs/development/libraries/telepathy/qt5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt5, pkgconfig, python, libxslt, dbus_glib, dbus_daemon +{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python, libxslt, dbus_glib, dbus_daemon , telepathy_farstream, telepathy_glib, pythonDBus }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig python libxslt ]; - propagatedBuildInputs = [ qt5.base dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; + propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; cmakeFlags = [ "-DDESIRED_QT_VERSION=5" ]; diff --git a/pkgs/development/libraries/telepathy/qt5/old.nix b/pkgs/development/libraries/telepathy/qt5/old.nix new file mode 100644 index 00000000000..50d569f3091 --- /dev/null +++ b/pkgs/development/libraries/telepathy/qt5/old.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, cmake, qt5, pkgconfig, python, libxslt, dbus_glib, dbus_daemon +, telepathy_farstream, telepathy_glib, pythonDBus }: + +stdenv.mkDerivation rec { + name = "telepathy-qt5-0.9.5"; + + src = fetchurl { + url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; + sha256 = "13lwh23ad9bg7hx1mj4xjc2lb8nlaaw8hbrmx5gg8nz5xxc4hiwk"; + }; + + nativeBuildInputs = [ cmake pkgconfig python libxslt ]; + propagatedBuildInputs = [ qt5.base dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; + + cmakeFlags = [ "-DDESIRED_QT_VERSION=5" ]; + + buildInputs = stdenv.lib.optional doCheck dbus_daemon; + + preBuild = '' + NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`" + ''; + + enableParallelBuilding = true; + doCheck = false; # giving up for now + + meta = { + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 745ec5bb709..5dd6aedf57e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7962,6 +7962,8 @@ let signon = callPackage ../development/libraries/signon { }; + telepathy = callPackage ../development/libraries/telepathy/qt5 { }; + vlc = callPackage ../applications/video/vlc { qt4 = null; withQt5 = true; @@ -8267,7 +8269,7 @@ let telepathy_qt = callPackage ../development/libraries/telepathy/qt { }; - telepathy_qt5 = callPackage ../development/libraries/telepathy/qt5 { }; + telepathy_qt5 = callPackage ../development/libraries/telepathy/qt5/old.nix {}; tevent = callPackage ../development/libraries/tevent { python = python2; From fdc0e1749066bf84c234906ff9bebe664028f097 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:25:52 -0500 Subject: [PATCH 25/43] cantata: build with Qt 5.5 --- pkgs/applications/audio/cantata/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index b23384e9293..fa0fe73ebae 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake , withQt4 ? false, qt4 -, withQt5 ? true, qt5 +, withQt5 ? true, qtbase, qtsvg, qttools # I'm unable to make KDE work here, crashes at runtime so I simply # make Qt4 the default until someone who wants KDE can figure it out. @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ] ++ stdenv.lib.optional withQt4 qt4 - ++ stdenv.lib.optionals withQt5 (with qt5; [ base svg tools ]) + ++ stdenv.lib.optionals withQt5 [ qtbase qtsvg qttools ] ++ stdenv.lib.optional withKDE4 kde4.kdelibs ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ] @@ -91,6 +91,10 @@ stdenv.mkDerivation rec { "-DENABLE_UDISKS2=ON" ]; + postInstall = '' + wrapQtProgram "$out/bin/cantata" + ''; + meta = with stdenv.lib; { homepage = http://code.google.com/p/cantata/; description = "A graphical client for MPD"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5dd6aedf57e..fdc0f633101 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -999,7 +999,7 @@ let davix = callPackage ../tools/networking/davix { }; - cantata = callPackage ../applications/audio/cantata { }; + cantata = qt5Libs.callPackage ../applications/audio/cantata { }; can-utils = callPackage ../os-specific/linux/can-utils { }; From d97dbf87c08af62b5e396f9e40252e64e7e85af6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:26:10 -0500 Subject: [PATCH 26/43] dfasma: build with Qt 5.5 --- pkgs/applications/audio/dfasma/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index fcd30e476cf..d439f344f5b 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, libsndfile, qt5 }: +{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia }: let @@ -39,7 +39,7 @@ in stdenv.mkDerivation { owner = "gillesdegottex"; }; - buildInputs = [ fftw libsndfile qt5.base qt5.multimedia ]; + buildInputs = [ fftw libsndfile qtbase qtmultimedia ]; postPatch = '' substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}' @@ -53,6 +53,10 @@ in stdenv.mkDerivation { enableParallelBuilding = true; + postInstall = '' + wrapQtProgram "$out/bin/dfasma" + ''; + meta = with stdenv.lib; { inherit version; description = "Analyse and compare audio files in time and frequency"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdc0f633101..61143d10f80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11002,7 +11002,7 @@ let plugins = []; }; - dfasma = callPackage ../applications/audio/dfasma { }; + dfasma = qt5Libs.callPackage ../applications/audio/dfasma { }; dia = callPackage ../applications/graphics/dia { inherit (pkgs.gnome) libart_lgpl libgnomeui; From e25434801b77eea206e47058b520b0588b08d43d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:26:33 -0500 Subject: [PATCH 27/43] fmit: build with Qt 5.5 --- pkgs/applications/audio/fmit/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index fe1f4c85c30..16573936068 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, freeglut, qt5 +{ stdenv, fetchFromGitHub, fftw, freeglut, qtbase, qtmultimedia , alsaSupport ? true, alsaLib ? null , jackSupport ? false, libjack2 ? null , portaudioSupport ? false, portaudio ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "gillesdegottex"; }; - buildInputs = [ fftw freeglut qt5.base qt5.multimedia ] + buildInputs = [ fftw freeglut qtbase qtmultimedia ] ++ stdenv.lib.optional alsaSupport [ alsaLib ] ++ stdenv.lib.optional jackSupport [ libjack2 ] ++ stdenv.lib.optional portaudioSupport [ portaudio ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61143d10f80..32630d05b47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11339,7 +11339,7 @@ let fluidsynth = callPackage ../applications/audio/fluidsynth { }; - fmit = callPackage ../applications/audio/fmit { }; + fmit = qt5Libs.callPackage ../applications/audio/fmit { }; focuswriter = callPackage ../applications/editors/focuswriter { }; From 3935f637325f3e126aaef4c84e8a24f2b022832a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:27:05 -0500 Subject: [PATCH 28/43] keyfinder: build with Qt 5.5 --- pkgs/applications/audio/keyfinder/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index edbedb1c013..ffd8d071ab2 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qt5, taglib }: +{ stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, taglib }: let version = "2.00"; in stdenv.mkDerivation { @@ -30,7 +30,7 @@ stdenv.mkDerivation { }; # TODO: upgrade libav when "Audio sample format conversion failed" is fixed - buildInputs = [ libav_0_8 libkeyfinder qt5.base qt5.xmlpatterns taglib ]; + buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns taglib ]; postPatch = '' substituteInPlace is_KeyFinder.pro \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32630d05b47..731ed0d0319 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11834,9 +11834,9 @@ let kermit = callPackage ../tools/misc/kermit { }; - keyfinder = callPackage ../applications/audio/keyfinder { }; + keyfinder = qt5Libs.callPackage ../applications/audio/keyfinder { }; - keyfinder-cli = callPackage ../applications/audio/keyfinder-cli { }; + keyfinder-cli = qt5Libs.callPackage ../applications/audio/keyfinder-cli { }; keymon = callPackage ../applications/video/key-mon { }; From 3060396296889c65f04460af53e4022958f0e147 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:27:31 -0500 Subject: [PATCH 29/43] musescore: build with Qt 5.5 --- pkgs/applications/audio/musescore/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 7f34d5df550..9dbfc96d571 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis -, portaudio, qt5 #, tesseract +, portaudio, qtbase, qtdeclarative, qtenginio, qtscript, qtsvg, qttools +, qtwebkit, qtxmlpatterns }: stdenv.mkDerivation rec { @@ -36,8 +37,8 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis - portaudio qt5.base qt5.declarative qt5.enginio qt5.script qt5.svg qt5.tools - qt5.webkit qt5.xmlpatterns #tesseract + portaudio qtbase qtdeclarative qtenginio qtscript qtsvg qttools + qtwebkit qtxmlpatterns #tesseract ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 731ed0d0319..a1f3449a6a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12165,7 +12165,7 @@ let iceSupport = config.murmur.iceSupport or true; }; - musescore = callPackage ../applications/audio/musescore { }; + musescore = qt5Libs.callPackage ../applications/audio/musescore { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt { From 51496d6c6d278427f79a40e0760b9b2918d5b32a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:28:01 -0500 Subject: [PATCH 30/43] sonic-visualiser: build with Qt 5.5 --- pkgs/applications/audio/sonic-visualiser/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index e0aa6e00a46..bef2006d60b 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate -, libsndfile, pkgconfig, libpulseaudio, qt5, redland +, libsndfile, pkgconfig, libpulseaudio, qtbase, redland , rubberband, serd, sord, vampSDK, fftwFloat }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ libsndfile qt5.base fftw fftwFloat bzip2 librdf rubberband + [ libsndfile qtbase fftw fftwFloat bzip2 librdf rubberband libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland serd sord @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,share/sonic-visualiser} cp sonic-visualiser $out/bin/ cp -r samples $out/share/sonic-visualiser/ + wrapQtProgram "$out/bin/sonic-visualiser" ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1f3449a6a9..df84c2fcd0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12723,7 +12723,7 @@ let sipp = callPackage ../development/tools/misc/sipp { }; - sonic-visualiser = callPackage ../applications/audio/sonic-visualiser { + sonic-visualiser = qt5Libs.callPackage ../applications/audio/sonic-visualiser { inherit (pkgs.vamp) vampSDK; }; From 5ecc06293a56583001e33b5dd7340192fcdefc72 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:28:24 -0500 Subject: [PATCH 31/43] mudlet: build with Qt 5.5 --- pkgs/games/mudlet/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index 6fa0b8144d4..8b51d617403 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, pkgs, stdenv, makeWrapper, qt5, yajl, libzip, hunspell, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3 }: +{ fetchurl, pkgs, stdenv, makeWrapper, qtbase, yajl, libzip, hunspell +, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3 }: stdenv.mkDerivation rec { name = "mudlet-${version}"; @@ -9,7 +10,10 @@ stdenv.mkDerivation rec { sha256 = "08fhqd323kgz5s17ac5z9dhkjxcmwvcmvhzy0x1vw4rayhijfrd7"; }; - buildInputs = [ pkgs.unzip qt5.base lua5_1 hunspell libzip yajl boost makeWrapper luafilesystem luazip lrexlib luasqlite3 ]; + buildInputs = [ + pkgs.unzip qtbase lua5_1 hunspell libzip yajl boost makeWrapper + luafilesystem luazip lrexlib luasqlite3 + ]; configurePhase = "cd src && qmake"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df84c2fcd0f..bf5c63b1fe2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12136,7 +12136,7 @@ let mrxvt = callPackage ../applications/misc/mrxvt { }; - mudlet = callPackage ../games/mudlet { + mudlet = qt5Libs.callPackage ../games/mudlet { inherit (lua51Packages) luafilesystem lrexlib luazip luasqlite3; }; From 0331d7e7a7d2d5d1cf9486b5ef0b1adb1d8e2ddb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:36:23 -0500 Subject: [PATCH 32/43] flightgear: build with Qt 5.5 --- pkgs/games/flightgear/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index b1371e2f478..b55a37e9985 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -2,7 +2,7 @@ , freeglut, freealut, mesa, libICE, libjpeg, openal, openscenegraph, plib , libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr -, makeDesktopItem, qt5 +, makeDesktopItem, qtbase }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ freeglut freealut mesa libICE libjpeg openal openscenegraph plib libSM libunwind libX11 xproto libXext xextproto libXi inputproto - libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qt5.base + libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qtbase ]; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf5c63b1fe2..84e70d7c54c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13559,7 +13559,7 @@ let fairymax = callPackage ../games/fairymax {}; - flightgear = callPackage ../games/flightgear { }; + flightgear = qt5Libs.callPackage ../games/flightgear { }; freecell-solver = callPackage ../games/freecell-solver { }; From 8d5b2be9aee480324e31c6c748bb02c8acbcde6f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:37:23 -0500 Subject: [PATCH 33/43] lightdm_qt: build with Qt 5.5 --- pkgs/applications/display-managers/lightdm/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index fb323537020..dc50ced1a60 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 , intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit -, qt4 ? null, qt5 ? null +, qt4 ? null +, withQt5 ? false, qtbase }: let @@ -20,14 +21,14 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt qt4 libaudit - ] ++ stdenv.lib.optional (qt5 != null) qt5.base; + ] ++ stdenv.lib.optional withQt5 qtbase; configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" "--disable-tests" ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt" - ++ stdenv.lib.optional ((qt5.base or null) != null) "--enable-liblightdm-qt5"; + ++ stdenv.lib.optional withQt5 "--enable-liblightdm-qt5"; installFlags = [ "sysconfdir=\${out}/etc" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84e70d7c54c..c182e5d9aa0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12682,12 +12682,12 @@ let dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; - lightdm = callPackage ../applications/display-managers/lightdm { + lightdm = qt5Libs.callPackage ../applications/display-managers/lightdm { qt4 = null; - qt5 = null; + withQt5 = false; }; - lightdm_qt = lightdm.override { qt5 = qt5; }; + lightdm_qt = lightdm.override { withQt5 = true; }; lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { }; From 50f76e06257831db6f76e8dbd78e77641939adfa Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:37:44 -0500 Subject: [PATCH 34/43] mlt-qt5: build with Qt 5.5 --- .../libraries/mlt/{qt5.nix => qt-5.4.nix} | 0 pkgs/development/libraries/mlt/qt-5.5.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 42 insertions(+), 1 deletion(-) rename pkgs/development/libraries/mlt/{qt5.nix => qt-5.4.nix} (100%) create mode 100644 pkgs/development/libraries/mlt/qt-5.5.nix diff --git a/pkgs/development/libraries/mlt/qt5.nix b/pkgs/development/libraries/mlt/qt-5.4.nix similarity index 100% rename from pkgs/development/libraries/mlt/qt5.nix rename to pkgs/development/libraries/mlt/qt-5.4.nix diff --git a/pkgs/development/libraries/mlt/qt-5.5.nix b/pkgs/development/libraries/mlt/qt-5.5.nix new file mode 100644 index 00000000000..d66d3fe9372 --- /dev/null +++ b/pkgs/development/libraries/mlt/qt-5.5.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate +, libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg +}: + +stdenv.mkDerivation rec { + name = "mlt-${version}"; + version = "0.9.6"; + + src = fetchurl { + url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; + sha256 = "0s8ypg0q50zfcmq527y8cbdvzxhiqidm1923k28ar8jqmjp45ssh"; + }; + + buildInputs = [ + SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 + makeWrapper movit pkgconfig qtbase qtsvg sox + ]; + + # Mostly taken from: + # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine + configureFlags = [ + "--avformat-swscale" "--enable-gpl" "--enable-gpl" "--enable-gpl3" + "--enable-opengl" + ]; + + enableParallelBuilding = true; + + postInstall = '' + wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 + ''; + + meta = with stdenv.lib; { + description = "Open source multimedia framework, designed for television broadcasting"; + homepage = http://www.mltframework.org/; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c182e5d9aa0..bc141018441 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7604,7 +7604,7 @@ let qt = qt4; }; - mlt-qt5 = callPackage ../development/libraries/mlt/qt5.nix { }; + mlt-qt5 = callPackage ../development/libraries/mlt/qt-5.4.nix { }; movit = callPackage ../development/libraries/movit { }; @@ -7938,6 +7938,8 @@ let libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; + mlt = callPackage ../development/libraries/mlt/qt-5.5.nix {}; + openbr = callPackage ../development/libraries/openbr { }; phonon = callPackage ../development/libraries/phonon/qt5 { }; From 60fc0af74ad9e4c241f27ef41e5e1a4e45c57e14 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:38:42 -0500 Subject: [PATCH 35/43] sddm: build with Qt 5.5 --- .../applications/display-managers/sddm/default.nix | 14 ++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index ad2c885e496..82cd8bd3091 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchpatch, makeWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs -, libXdmcp, libXau, qt5, pam, systemd }: +{ stdenv, fetchpatch, fetchFromGitHub, cmake, pkgconfig, libxcb +, libpthreadstubs, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam +, systemd +}: let version = "0.11.0"; @@ -14,9 +16,9 @@ stdenv.mkDerivation rec { sha256 = "1s1gm0xvgwzrpxgni3ngdj8phzg21gkk1jyiv2l2i5ayl0jdm7ig"; }; - nativeBuildInputs = [ cmake pkgconfig qt5.tools makeWrapper ]; + nativeBuildInputs = [ cmake pkgconfig qttools ]; - buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qt5.base pam systemd ]; + buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd ]; patches = [ (fetchpatch { url = "https://github.com/sddm/sddm/commit/9bc21ee7da5de6b2531d47d1af4d7b0a169990b9.patch"; @@ -32,8 +34,8 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/sddm-greeter \ - --set QML2_IMPORT_PATH "${qt5.declarative}/lib/qt5/qml/" + wrapQtProgram $out/bin/sddm + wrapQtProgram $out/bin/sddm-greeter ''; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc141018441..3b8835cb79a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12705,7 +12705,7 @@ let printrun = callPackage ../applications/misc/printrun { }; - sddm = callPackage ../applications/display-managers/sddm { }; + sddm = qt5Libs.callPackage ../applications/display-managers/sddm { }; slim = callPackage ../applications/display-managers/slim { libpng = libpng12; From f00d622e446e91e9b8fd22cac081b98d17ab3710 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 11:14:14 -0500 Subject: [PATCH 36/43] dropbox: set meta.platforms --- pkgs/applications/networking/dropbox/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 3b157857ff9..884b82fe072 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -124,5 +124,6 @@ in stdenv.mkDerivation { homepage = "http://www.dropbox.com"; description = "Online stored folders (daemon version)"; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } From 62fc4cf4d1484d445ecd47833b3d56986f212610 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 11:14:28 -0500 Subject: [PATCH 37/43] add qt5Libs --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b8835cb79a..a06073c8b20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7974,6 +7974,7 @@ let }; qt55Libs = lib.makeScope qt55.newScope qt5LibsFun; + qt5Libs = qt55Libs; qtEnv = callPackage ../development/libraries/qt-5/qt-env.nix {}; From f998d502fc6efe727659ad883c17acecb9177c0d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 11:14:36 -0500 Subject: [PATCH 38/43] dropbox: build with Qt 5.5 --- pkgs/applications/networking/dropbox/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 884b82fe072..f212304b96c 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper , dbus_libs, gcc, glib, libdrm, libffi, libICE, libSM , libX11, libXmu, ncurses, popt, qt5, zlib +, qtbase, qtdeclarative, qtwebkit }: # this package contains the daemon version of dropbox @@ -44,7 +45,7 @@ let ldpath = stdenv.lib.makeSearchPath "lib" [ dbus_libs gcc glib libdrm libffi libICE libSM libX11 - libXmu ncurses popt qt5.base qt5.declarative qt5.webkit + libXmu ncurses popt qtbase qtdeclarative qtwebkit zlib ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a06073c8b20..88a50ec81e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12681,7 +12681,7 @@ let copy-com = callPackage ../applications/networking/copy-com { }; - dropbox = callPackage ../applications/networking/dropbox { }; + dropbox = qt5Libs.callPackage ../applications/networking/dropbox { }; dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; From d8d5e9868cecd03e7a8e73208e019d79f1376ed8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 12:14:51 -0500 Subject: [PATCH 39/43] dropbox: prepare for Qt upgrade --- .../networking/dropbox/default.nix | 84 ++++++++++++------- pkgs/top-level/all-packages.nix | 6 +- 2 files changed, 59 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index f212304b96c..08a4b0dacbd 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf , dbus_libs, gcc, glib, libdrm, libffi, libICE, libSM , libX11, libXmu, ncurses, popt, qt5, zlib , qtbase, qtdeclarative, qtwebkit @@ -33,20 +33,13 @@ let "i686-linux" = "x86"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - interpreter = - { - "x86_64-linux" = "ld-linux-x86-64.so.2"; - "i686-linux" = "ld-linux.so.2"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - # relative location where the dropbox libraries are stored appdir = "opt/dropbox"; ldpath = stdenv.lib.makeSearchPath "lib" [ - dbus_libs gcc glib libdrm libffi libICE libSM libX11 - libXmu ncurses popt qtbase qtdeclarative qtwebkit - zlib + dbus_libs gcc.cc glib libdrm libffi libICE libSM libX11 libXmu + ncurses popt qtbase qtdeclarative qtwebkit zlib ]; desktopItem = makeDesktopItem { @@ -59,24 +52,22 @@ let }; in stdenv.mkDerivation { - name = "dropbox-${version}-bin"; + name = "dropbox-${version}"; src = fetchurl { name = "dropbox-${version}.tar.gz"; url = "https://dl-web.dropbox.com/u/17/dropbox-lnx.${arch}-${version}.tar.gz"; inherit sha256; }; - sourceRoot = "."; + sourceRoot = ".dropbox-dist"; - patchPhase = '' - rm -f .dropbox-dist/dropboxd - ''; - - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper patchelf ]; + dontPatchELF = true; # patchelf invoked explicitly below + dontStrip = true; # already done installPhase = '' mkdir -p "$out/${appdir}" - cp -r ".dropbox-dist/dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/" + cp -r "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/" rm "$out/${appdir}/libdrm.so.2" rm "$out/${appdir}/libffi.so.6" @@ -102,23 +93,56 @@ in stdenv.mkDerivation { rm "$out/${appdir}/qt.conf" rm -fr "$out/${appdir}/plugins" - find "$out/${appdir}" -type f -a -perm -0100 \ - -print -exec patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} {} \; - - RPATH=${ldpath}:${gcc.cc}/lib:$out/${appdir} - echo "updating rpaths to: $RPATH" - find "$out/${appdir}" -type f -a -perm -0100 \ - -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \; - mkdir -p "$out/share/applications" cp "${desktopItem}/share/applications/"* $out/share/applications - mkdir -p "$out/bin" - makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \ - --prefix LD_LIBRARY_PATH : "${ldpath}" - mkdir -p "$out/share/icons" ln -s "$out/${appdir}/images/hicolor" "$out/share/icons/hicolor" + + mkdir -p "$out/bin" + RPATH="${ldpath}:$out/${appdir}" + makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \ + --prefix LD_LIBRARY_PATH : "$RPATH" + ''; + + fixupPhase = '' + INTERP=$(cat $NIX_CC/nix-support/dynamic-linker) + RPATH="${ldpath}:$out/${appdir}" + getType='s/ *Type: *\([A-Z]*\) (.*/\1/' + find "$out/${appdir}" -type f -a -perm -0100 -print | while read obj; do + dynamic=$(readelf -S "$obj" 2>/dev/null | grep "DYNAMIC" || true) + + if [[ -n "$dynamic" ]]; then + type=$(readelf -h "$obj" 2>/dev/null | grep 'Type:' | sed -e "$getType") + + if [[ "$type" == "EXEC" ]]; then + + echo "patching interpreter path in $type $obj" + patchelf --set-interpreter "$INTERP" "$obj" + + echo "patching RPATH in $type $obj" + oldRPATH=$(patchelf --print-rpath "$obj") + patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj" + + echo "shrinking RPATH in $type $obj" + patchelf --shrink-rpath "$obj" + + elif [[ "$type" == "DYN" ]]; then + + echo "patching RPATH in $type $obj" + oldRPATH=$(patchelf --print-rpath "$obj") + patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj" + + echo "shrinking RPATH in $type $obj" + patchelf --shrink-rpath "$obj" + + else + + echo "unknown ELF type \"$type\"; not patching $obj" + + fi + fi + done ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88a50ec81e7..491e2c469a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12681,7 +12681,11 @@ let copy-com = callPackage ../applications/networking/copy-com { }; - dropbox = qt5Libs.callPackage ../applications/networking/dropbox { }; + dropbox = callPackage ../applications/networking/dropbox { + qtbase = qt5.base; + qtdeclarative = qt5.declarative; + qtwebkit = qt5.webkit; + }; dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; From 63d95f505e74ba53c07bcf950c53c1cb1a1a62f0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 14:27:49 -0500 Subject: [PATCH 40/43] kdeApps_15_08: allow overriding mkDerivation --- pkgs/applications/kde-apps-15.08/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/kde-apps-15.08/default.nix b/pkgs/applications/kde-apps-15.08/default.nix index d47dcd11b0b..28621141122 100644 --- a/pkgs/applications/kde-apps-15.08/default.nix +++ b/pkgs/applications/kde-apps-15.08/default.nix @@ -64,6 +64,6 @@ let print-manager = callPackage ./print-manager.nix {}; }; - newScope = scope: pkgs.kf513.newScope (scope // { inherit mkDerivation; }); + newScope = scope: pkgs.kf513.newScope ({ inherit mkDerivation; } // scope); in lib.makeScope newScope packages From 3ae6dabaedf558349379a081d7acb321988ca647 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 14:28:03 -0500 Subject: [PATCH 41/43] plasma54: allow overriding mkDerivation --- pkgs/desktops/plasma-5.4/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5.4/default.nix b/pkgs/desktops/plasma-5.4/default.nix index 152bc351067..172acb08a05 100644 --- a/pkgs/desktops/plasma-5.4/default.nix +++ b/pkgs/desktops/plasma-5.4/default.nix @@ -82,6 +82,6 @@ let systemsettings = callPackage ./systemsettings.nix {}; }; - newScope = scope: kdeApps.newScope (scope // { inherit mkDerivation; }); + newScope = scope: kdeApps.newScope ({ inherit mkDerivation; } // scope); in lib.makeScope newScope addPackages From c20b7ba4f35bdce4ef8c7566defeb6dbe272dde1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 14:44:15 -0500 Subject: [PATCH 42/43] cool-retro-term: build with Qt 5.5 --- pkgs/applications/misc/cool-retro-term/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index 455d33860fb..9f97e1eccee 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, makeWrapper, qt5, qmltermwidget }: +{ stdenv, fetchgit, makeWrapper, qtbase, qtquick1, qmltermwidget }: stdenv.mkDerivation rec { version = "1.0.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sed -i -e '/qmltermwidget/d' cool-retro-term.pro ''; - buildInputs = [ makeWrapper qt5.base qt5.quick1 qmltermwidget ]; + buildInputs = [ makeWrapper qtbase qtquick1 qmltermwidget ]; configurePhase = "qmake PREFIX=$out"; @@ -26,8 +26,7 @@ stdenv.mkDerivation rec { mv $out/usr/bin $out/bin rmdir $out/usr - wrapProgram $out/bin/cool-retro-term \ - --prefix QML2_IMPORT_PATH : "${qmltermwidget}/lib/qml/" + wrapQtProgram $out/bin/cool-retro-term ''; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 491e2c469a1..984b49adfd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1136,7 +1136,7 @@ let convmv = callPackage ../tools/misc/convmv { }; - cool-retro-term = callPackage ../applications/misc/cool-retro-term { }; + cool-retro-term = qt5Libs.callPackage ../applications/misc/cool-retro-term { }; coreutils = callPackage ../tools/misc/coreutils { aclSupport = stdenv.isLinux; From 79be4a769f2367b450eef88f064cbf6d36d0d9bd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 16:06:29 -0500 Subject: [PATCH 43/43] manual: document Qt packaging tools --- doc/language-support.xml | 66 ++++++++++++++++++++++++++++++++++++++++ doc/stdenv.xml | 2 +- 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/doc/language-support.xml b/doc/language-support.xml index a969111ed77..48b9209b0ad 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -981,6 +981,72 @@ stdenv.mkDerivation { +
Qt + +The information in this section applies to Qt 5.5 and later. + +Qt is an application development toolkit for C++. Although it is +not a distinct programming language, there are special considerations +for packaging Qt-based programs and libraries. A small set of tools +and conventions has grown out of these considerations. + +
Libraries + +Packages that provide libraries should be listed in +qt5LibsFun so that the library is built with each +Qt version. A set of packages is provided for each version of Qt; for +example, qt5Libs always provides libraries built +with the latest version, qt55Libs provides +libraries built with Qt 5.5, and so on. To avoid version conflicts, no +top-level attributes are created for these packages. + +
+ +
Programs + +Application packages do not need to be built with every Qt +version. To ensure consistency between the package's dependencies, +call the package with qt5Libs.callPackage instead +of the usual callPackage. An older version may be +selected in case of incompatibility. For example, to build with Qt +5.5, call the package with +qt55Libs.callPackage. + +Several environment variables must be set at runtime for Qt +applications to function correctly, including: + + + QT_PLUGIN_PATH + QML_IMPORT_PATH + QML2_IMPORT_PATH + XDG_DATA_DIRS + + +To ensure that these are set correctly, the program must be wrapped by +invoking wrapQtProgram program +during installation (for example, during +fixupPhase). wrapQtProgram +accepts the same options as makeWrapper. + + +
+ +
KDE + +Many of the considerations above also apply to KDE packages, +especially the need to set the correct environment variables at +runtime. To ensure that this is done, invoke wrapKDEProgram +program during +installation. wrapKDEProgram also generates a +ksycoca database so that required data and services +can be found. Like its Qt counterpart, +wrapKDEProgram accepts the same options as +makeWrapper. + +
+ +
+