From 28f7f0a1a21329740b64b5eb319ba9c46434790a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 27 Jan 2015 07:31:04 -0600 Subject: [PATCH 1/4] add kde-frameworks-5.6 --- .../libraries/kde-frameworks-5.6/default.nix | 188 +++++++ .../kde-frameworks-5.6/dependencies.nix | 500 ++++++++++++++++++ .../kde-frameworks-5.6/dependencies.sh | 22 + .../0001-libdir-default.patch | 55 ++ .../0002-qt5-plugin-dir.patch | 25 + .../kauth/kauth-policy-install.patch | 13 + ...utils-pluginselector-follow-symlinks.patch | 13 + ...igwidgets-helpclient-follow-symlinks.patch | 13 + .../kdoctools-no-find-docbook-xml.patch | 12 + .../kinit/kinit-libpath.patch | 30 ++ ...service-kbuildsycoca-follow-symlinks.patch | 13 + ...ce-kbuildsycoca-no-canonicalize-path.patch | 13 + .../libraries/kde-frameworks-5.6/manifest.nix | 382 +++++++++++++ .../libraries/kde-frameworks-5.6/manifest.sh | 15 + .../plasma-framework-external-paths.patch | 13 + .../libraries/kde-frameworks-5.6/renames.nix | 68 +++ .../kde-frameworks-5.6/setup-hook.sh | 1 + pkgs/top-level/all-packages.nix | 5 +- 18 files changed, 1380 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/kde-frameworks-5.6/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.6/dependencies.nix create mode 100755 pkgs/development/libraries/kde-frameworks-5.6/dependencies.sh create mode 100644 pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0001-libdir-default.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0002-qt5-plugin-dir.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.6/kauth/kauth-policy-install.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.6/kcmutils/kcmutils-pluginselector-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.6/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.6/kdoctools/kdoctools-no-find-docbook-xml.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.6/kinit/kinit-libpath.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.6/manifest.nix create mode 100755 pkgs/development/libraries/kde-frameworks-5.6/manifest.sh create mode 100644 pkgs/development/libraries/kde-frameworks-5.6/plasma-framework/plasma-framework-external-paths.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.6/renames.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.6/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.6/default.nix b/pkgs/development/libraries/kde-frameworks-5.6/default.nix new file mode 100644 index 00000000000..2a2dc9fa938 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.6/default.nix @@ -0,0 +1,188 @@ +# 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. + +{ autonix, fetchurl, pkgs, qt5, stdenv, debug ? false }: + +with stdenv.lib; with autonix; + +let + + mkDerivation = drv: + stdenv.mkDerivation + (drv // { + src = fetchurl drv.src; + + setupHook = ./setup-hook.sh; + + enableParallelBuilding = drv.enableParallelBuilding or true; + cmakeFlags = + (drv.cmakeFlags or []) + ++ [ "-DBUILD_TESTING=OFF" + "-DKDE_DEFAULT_HOME=.kde5" + "-DKDE4_DEFAULT_HOME=.kde" + ] + ++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; + + meta = drv.meta or + { + license = with stdenv.lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + homepage = "http://www.kde.org"; + }; + }); + + renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"]; + + scope = + # packages in this collection + (mapAttrs (dep: name: kf5."${name}") renames) // + # packages pinned to this version of Qt 5 + { + Phonon4Qt5 = pkgs.phonon_qt5.override { inherit qt5; }; + Qt5 = qt5; + Qt5Core = qt5; + Qt5DBus = qt5; + Qt5Test = qt5; + Qt5Widgets = qt5; + Qt5X11Extras = qt5; + dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; }; + } // + # packages from the nixpkgs collection + (with pkgs; + { + inherit cmake; + Boost = boost; + GIF = giflib; + GLIB2 = glib; + Gpgme = gpgme; + JPEG = libjpeg; + LibGcrypt = libgcrypt; + LibGit2 = libgit2; + LibIntl = gettext; + LibLZMA = lzma; + NetworkManager = networkmanager; + Perl = perl; + PythonInterp = python; + QImageBlitz = qimageblitz; + SharedMimeInfo = shared_mime_info; + ZLIB = zlib; + } + ); + + mirror = "mirror://kde"; + + preResolve = super: + fold (f: x: f x) super + [ + (userEnvPkg "SharedMimeInfo") + (userEnvPkg "SharedDesktopOntologies") + ]; + + postResolve = super: + super // { + extra-cmake-modules = { + inherit (super.extra-cmake-modules) name src; + + propagatedNativeBuildInputs = with pkgs; [ cmake pkgconfig ]; + cmakeFlags = ["-DBUILD_TESTING=OFF"]; + patches = + [ + ./extra-cmake-modules/0001-libdir-default.patch + ./extra-cmake-modules/0002-qt5-plugin-dir.patch + ]; + meta = { + license = with stdenv.lib.licenses; [ bsd2 ]; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + homepage = "http://www.kde.org"; + }; + }; + + kauth = with pkgs; super.kauth // { + buildInputs = super.kauth.buildInputs ++ [polkit_qt5]; + patches = [./kauth/kauth-policy-install.patch]; + }; + + kcmutils = super.kcmutils // { + patches = + [./kcmutils/kcmutils-pluginselector-follow-symlinks.patch]; + }; + + kconfigwidgets = super.kconfigwidgets // { + patches = + [./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch]; + }; + + kdelibs4support = with pkgs; super.kdelibs4support // { + buildInputs = + super.kdelibs4support.buildInputs + ++ [networkmanager xlibs.libSM]; + cmakeFlags = + (super.kdelibs4support.cmakeFlags or []) + ++ [ + "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" + "-DDocBookXML4_DTD_VERSION=4.5" + ]; + }; + + kdoctools = with pkgs; super.kdoctools // { + cmakeFlags = + (super.kdoctools.cmakeFlags or []) + ++ [ + "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" + "-DDocBookXML4_DTD_VERSION=4.5" + "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" + ]; + patches = [./kdoctools/kdoctools-no-find-docbook-xml.patch]; + }; + + ki18n = with pkgs; super.ki18n // { + propagatedNativeBuildInputs = + super.ki18n.propagatedNativeBuildInputs ++ [gettext python]; + }; + + kimageformats = with pkgs; super.kimageformats // { + NIX_CFLAGS_COMPILE = + (super.kimageformats.NIX_CFLAGS_COMPILE or "") + + " -I${ilmbase}/include/OpenEXR"; + }; + + kinit = super.kinit // { patches = [ ./kinit/kinit-libpath.patch ]; }; + + kservice = super.kservice // { + buildInputs = super.kservice.buildInputs ++ [kf5.kwindowsystem]; + patches = + [ + ./kservice/kservice-kbuildsycoca-follow-symlinks.patch + ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch + ]; + }; + + /* + plasma-framework = super.plasma-framework // { + patches = [ ./plasma-framework/plasma-framework-external-paths.patch ]; + }; + */ + }; + + kf5 = generateCollection ./. { + inherit mirror mkDerivation preResolve postResolve renames scope; + }; + +in + + kf5 // { inherit mkDerivation qt5 scope; } diff --git a/pkgs/development/libraries/kde-frameworks-5.6/dependencies.nix b/pkgs/development/libraries/kde-frameworks-5.6/dependencies.nix new file mode 100644 index 00000000000..608bff01b92 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.6/dependencies.nix @@ -0,0 +1,500 @@ +# DO NOT EDIT! This file is generated automatically. +{ }: +{ + attica = { + buildInputs = [ "ECM" "Qt5" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + extra-cmake-modules = { + buildInputs = [ "AGG" "Blitz" "BlueZ" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "Flex" "GObject" "GStreamer" "LCMS" "LibArt" "OpenEXR" "PCRE" "QCA2" "QImageBlitz" "Qt5Core" "Qt5LinguistTools" "Sqlite" "Strigi" "USB" "Xine" "Xmms" ]; + nativeBuildInputs = [ "LibXslt" "QCOLLECTIONGENERATOR_EXECUTABLE" "SPHINX_EXECUTABLE" "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + frameworkintegration = { + buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5Test" "XCB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kactivities = { + buildInputs = [ "Boost" "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kapidox = { + buildInputs = [ ]; + nativeBuildInputs = [ "PythonInterp" "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + karchive = { + buildInputs = [ "BZip2" "ECM" "KF5Archive" "LibLZMA" "Qt5Core" "Qt5Test" "ZLIB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kauth = { + buildInputs = [ "ECM" "KF5CoreAddons" "Qt5" "Qt5Test" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5CoreAddons" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kbookmarks = { + buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5IconThemes" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5XmlGui" "Qt5Widgets" "Qt5Xml" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kcmutils = { + buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kcodecs = { + buildInputs = [ "ECM" "Qt5Core" "Qt5Test" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kcompletion = { + buildInputs = [ "ECM" "KF5Config" "KF5WidgetsAddons" "Qt5" "Qt5Test" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Config" "KF5WidgetsAddons" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kconfig = { + buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5Test" "Qt5Xml" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Xml" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kconfigwidgets = { + buildInputs = [ "ECM" "KF5Auth" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Auth" "KF5Codecs" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kcoreaddons = { + buildInputs = [ "ECM" "FAM" "Qt5" "Qt5Test" "Qt5Widgets" "SharedMimeInfo" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ "SharedMimeInfo" ]; + }; + + kcrash = { + buildInputs = [ "ECM" "KF5CoreAddons" "KF5WindowSystem" "Qt5" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5CoreAddons" "KF5WindowSystem" "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kdbusaddons = { + buildInputs = [ "ECM" "Qt5DBus" "Qt5Test" "Qt5X11Extras" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5DBus" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kdeclarative = { + buildInputs = [ "ECM" "KF5" "KF5Config" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5Test" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5KIO" "Qt5Qml" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kded = { + buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5Init" "KF5Service" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kdelibs4support = { + buildInputs = [ "AGG" "Blitz" "BlueZ" "DocBookXML4" "ECM" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "GObject" "GStreamer" "KDEWin" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Service" "KF5TextWidgets" "KF5UnitConversion" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LCMS" "LibArt" "NetworkManager" "OpenEXR" "OpenSSL" "PCRE" "QCA2" "QImageBlitz" "QNtrack" "Qt5" "Qt5X11Extras" "Sqlite" "USB" "X11" "Xine" "Xmms" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KDEWin" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5Emoticons" "KF5GuiAddons" "KF5IconThemes" "KF5Init" "KF5ItemModels" "KF5KDELibs4Support" "KF5Notifications" "KF5Parts" "KF5TextWidgets" "KF5UnitConversion" "KF5WindowSystem" "Qt5DBus" "Qt5PrintSupport" "Qt5Xml" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kdesignerplugin = { + buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Plotting" "KF5Sonnet" "KF5TextWidgets" "KF5WebKit" "KF5WidgetsAddons" "KF5XmlGui" "Qt5Core" "Qt5Designer" "Qt5Test" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kdesu = { + buildInputs = [ "ECM" "KF5CoreAddons" "KF5Pty" "KF5Service" "Qt5Core" "X11" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Pty" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kdewebkit = { + buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5JobWidgets" "KF5KIO" "KF5Parts" "KF5Service" "KF5Wallet" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5WebKitWidgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kdnssd = { + buildInputs = [ "Avahi" "DNSSD" "ECM" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Network" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kdoctools = { + buildInputs = [ "DocBookXML4" "DocBookXSL" "ECM" "KF5Archive" "KF5DocTools" "KF5I18n" "LibXml2" "Qt5Core" ]; + nativeBuildInputs = [ "LibXslt" "cmake" ]; + propagatedBuildInputs = [ "KF5Archive" "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kemoticons = { + buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5Service" "Qt5" "Qt5Test" "Qt5Xml" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Archive" "KF5Service" "Qt5Gui" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kglobalaccel = { + buildInputs = [ "ECM" "Qt5" "X11" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5DBus" "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kguiaddons = { + buildInputs = [ "ECM" "Qt5" "Qt5Gui" "Qt5X11Extras" "X11" "XCB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Gui" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + khtml = { + buildInputs = [ "ECM" "GIF" "JPEG" "KDEWin" "KF5Archive" "KF5Codecs" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "OpenSSL" "PNG" "Phonon4Qt5" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ]; + nativeBuildInputs = [ "Perl" "cmake" ]; + propagatedBuildInputs = [ "KF5Archive" "KF5Bookmarks" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + ki18n = { + buildInputs = [ "ECM" "LibIntl" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kiconthemes = { + buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5Svg" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kidletime = { + buildInputs = [ "ECM" "Qt5" "X11" "X11_XCB" "XCB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kimageformats = { + buildInputs = [ "ECM" "Jasper" "OpenEXR" "Qt5Gui" "Qt5PrintSupport" "Qt5Test" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kinit = { + buildInputs = [ "ECM" "KF5Config" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5Service" "KF5WindowSystem" "Libcap" "Qt5" "X11" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kio = { + buildInputs = [ "ACL" "ECM" "GSSAPI" "KF5Archive" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5JobWidgets" "KF5Notifications" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LibXml2" "OpenSSL" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Script" "Qt5Test" "Qt5Widgets" "Strigi" "X11" "ZLIB" ]; + nativeBuildInputs = [ "LibXslt" "cmake" ]; + propagatedBuildInputs = [ "KF5Bookmarks" "KF5Completion" "KF5ItemViews" "KF5JobWidgets" "KF5Service" "KF5Solid" "KF5XmlGui" "Qt5Network" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kitemmodels = { + buildInputs = [ "ECM" "Grantlee" "Qt5" "Qt5Core" "Qt5Script" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kitemviews = { + buildInputs = [ "ECM" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kjobwidgets = { + buildInputs = [ "ECM" "KF5CoreAddons" "KF5WidgetsAddons" "Qt5" "Qt5X11Extras" "X11" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5CoreAddons" "KF5WidgetsAddons" "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kjs = { + buildInputs = [ "ECM" "PCRE" "Qt5Core" "Qt5Test" ]; + nativeBuildInputs = [ "Perl" "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kjsembed = { + buildInputs = [ "ECM" "KF5DocTools" "KF5I18n" "KF5JS" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5I18n" "KF5JS" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kmediaplayer = { + buildInputs = [ "ECM" "KF5Parts" "KF5XmlGui" "Qt5DBus" "Qt5Test" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Parts" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + knewstuff = { + buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Archive" "KF5Attica" "KF5KIO" "KF5XmlGui" "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + knotifications = { + buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5IconThemes" "KF5Service" "KF5WindowSystem" "Phonon4Qt5" "Qt5" "Qt5X11Extras" "X11" "dbusmenu-qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5WindowSystem" "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + knotifyconfig = { + buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5Test" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5I18n" "KF5KIO" "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kpackage = { + buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Test" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kparts = { + buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5JobWidgets" "KF5KIO" "KF5Notifications" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5KIO" "KF5Notifications" "KF5TextWidgets" "KF5XmlGui" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kplotting = { + buildInputs = [ "ECM" "Qt5" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kpty = { + buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5CoreAddons" "KF5I18n" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kross = { + buildInputs = [ "ECM" "KF5Completion" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5WidgetsAddons" "Qt5Script" "Qt5Widgets" "Qt5Xml" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + krunner = { + buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5Service" "KF5Solid" "KF5ThreadWeaver" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Plasma" "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kservice = { + buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + ktexteditor = { + buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5KIO" "KF5Parts" "KF5Sonnet" "LibGit2" "Qt5" ]; + nativeBuildInputs = [ "Perl" "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + ktextwidgets = { + buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Completion" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WindowSystem" "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kunitconversion = { + buildInputs = [ "ECM" "KF5I18n" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Config" "KF5I18n" "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kwallet = { + buildInputs = [ "ECM" "Gpgme" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Gpgmepp" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "LibGcrypt" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Config" "KF5WindowSystem" "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kwidgetsaddons = { + buildInputs = [ "ECM" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kwindowsystem = { + buildInputs = [ "ECM" "Qt5" "Qt5WinExtras" "X11" "XCB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kxmlgui = { + buildInputs = [ "ECM" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WindowSystem" "Qt5DBus" "Qt5Xml" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + networkmanager-qt = { + buildInputs = [ "ECM" "KF5NetworkManagerQt" "NetworkManager" "Qt4" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + plasma-framework = { + buildInputs = [ "ECM" "EGL" "Gpgme" "KActivities" "KCoreAddons" "KDE4Support" "KDESu" "KDeclarative" "KF5" "KF5Activities" "KF5Archive" "KF5Auth" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5IdleTime" "KF5Init" "KF5ItemModels" "KF5ItemViews" "KF5JS" "KF5JobWidgets" "KF5KArchive" "KF5KAuth" "KF5KBookmarks" "KF5KCodecs" "KF5KCompletion" "KF5KConfig" "KF5KConfigWidgets" "KF5KCoreAddons" "KF5KCrash" "KF5KDBusAddons" "KF5KDE4Support" "KF5KDESu" "KF5KDeclarative" "KF5KDocTools" "KF5KF5GlobalAccel" "KF5KGuiAddons" "KF5KI18n" "KF5KIO" "KF5KIconThemes" "KF5KIdleTime" "KF5KInit" "KF5KJS" "KF5KJobWidgets" "KF5KNotifications" "KF5KParts" "KF5KService" "KF5KTextWidgets" "KF5KUnitConversion" "KF5KWallet" "KF5KWidgetsAddons" "KF5KWindowSystem" "KF5Kross" "KF5NO_MODULE" "KF5Notifications" "KF5Package" "KF5Parts" "KF5Service" "KF5Solid" "KF5Sonnet" "KF5Su" "KF5TextWidgets" "KF5ThreadWeaver" "KF5UnitConversion" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "OpenGL" "QCA2" "Qt5" "Qt5Test" "Qt5Widgets" "Solid" "X11" "XCB" ]; + nativeBuildInputs = [ "SH" "cmake" ]; + propagatedBuildInputs = [ "KF5Package" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + solid = { + buildInputs = [ "ECM" "IOKit" "MediaPlayerInfo" "Qt5" "Qt5Qml" "UDev" ]; + nativeBuildInputs = [ "BISON" "FLEX" "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + sonnet = { + buildInputs = [ "ASPELL" "ECM" "ENCHANT" "HSPELL" "HUNSPELL" "Qt5" "Qt5Test" "ZLIB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + threadweaver = { + buildInputs = [ "ECM" "KF5ThreadWeaver" "Qt5" "Qt5Core" "Qt5Test" "Qt5Widgets" ]; + nativeBuildInputs = [ "SNIPPETEXTRACTOR" "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + +} diff --git a/pkgs/development/libraries/kde-frameworks-5.6/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.6/dependencies.sh new file mode 100755 index 00000000000..2b220244c59 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.6/dependencies.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +# This script rebuilds dependencies.nix. +# You must run manifest.sh first to download the packages. + +# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs. +# If you are working on the packages, this is probably what you want. + +# You can also pass the path to a source tree where you have built +# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is +# probably what you want. + +manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix') + +autonixDepsKf5="" +if [[ -z $1 ]]; then + autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin +else + autonixDepsKF5="$1/dist/build/kf5-deps" +fi + +exec ${autonixDepsKF5}/kf5-deps "${manifestXML}" diff --git a/pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0001-libdir-default.patch b/pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0001-libdir-default.patch new file mode 100644 index 00000000000..faed0e6edc9 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0001-libdir-default.patch @@ -0,0 +1,55 @@ +From f1e22a65f94a231edfe01ac6a3fcf30d95b6329f Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 31 Dec 2014 07:16:45 -0600 +Subject: [PATCH 1/2] libdir default + +--- + kde-modules/KDEInstallDirs.cmake | 31 +------------------------------ + 1 file changed, 1 insertion(+), 30 deletions(-) + +diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake +index e255e87..a79a12a 100644 +--- a/kde-modules/KDEInstallDirs.cmake ++++ b/kde-modules/KDEInstallDirs.cmake +@@ -162,37 +162,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() + + # Macro for variables that are relative to another variable. We store an empty + # value in the cache (for documentation/GUI cache editor purposes), and store +-- +2.1.4 + diff --git a/pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0002-qt5-plugin-dir.patch b/pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0002-qt5-plugin-dir.patch new file mode 100644 index 00000000000..5982aa8a06f --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0002-qt5-plugin-dir.patch @@ -0,0 +1,25 @@ +From e4fb9d880cefa743df2b5da3a67db617d66faf63 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 31 Dec 2014 07:23:59 -0600 +Subject: [PATCH 2/2] qt5 plugin dir + +--- + kde-modules/KDEInstallDirs.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake +index a79a12a..70dbe02 100644 +--- a/kde-modules/KDEInstallDirs.cmake ++++ b/kde-modules/KDEInstallDirs.cmake +@@ -315,7 +315,7 @@ 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) + +-- +2.1.4 + diff --git a/pkgs/development/libraries/kde-frameworks-5.6/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.6/kauth/kauth-policy-install.patch new file mode 100644 index 00000000000..340155256f2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.6/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.6/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.6/kcmutils/kcmutils-pluginselector-follow-symlinks.patch new file mode 100644 index 00000000000..47b8dfad180 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.6/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.6/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.6/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch new file mode 100644 index 00000000000..3bd946cbd84 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.6/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.6/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.6/kdoctools/kdoctools-no-find-docbook-xml.patch new file mode 100644 index 00000000000..4e3a33efab3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.6/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.6/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.6/kinit/kinit-libpath.patch new file mode 100644 index 00000000000..a6ccb2085d3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.6/kinit/kinit-libpath.patch @@ -0,0 +1,30 @@ +diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp +index 3c3c913..f510620 100644 +--- a/src/kdeinit/kinit.cpp ++++ b/src/kdeinit/kinit.cpp +@@ -652,15 +652,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/plugins, so the kdeinit5 ++ // shared libraries should be in /lib/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()) { diff --git a/pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-follow-symlinks.patch new file mode 100644 index 00000000000..e9bc418544a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.6/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.6/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch new file mode 100644 index 00000000000..7e21ebfe86f --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.6/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.6/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.6/manifest.nix new file mode 100644 index 00000000000..f8933d2f596 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.6/manifest.nix @@ -0,0 +1,382 @@ +# This file is generated automatically. DO NOT EDIT! +{ mirror }: +[ + { + url = "${mirror}/stable/frameworks/5.6/kdbusaddons-5.6.0.tar.xz"; + sha256 = "1gn4dm983d1nw7s8x3v9iq95glk0kpyj5zblylk76q8zjnxrx63r"; + name = "kdbusaddons-5.6.0.tar.xz"; + store = "/nix/store/l77sb2fblas9qd9g1fc01n53yipsg6fz-kdbusaddons-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kitemmodels-5.6.0.tar.xz"; + sha256 = "0b40hyzp9rdgm2lr2nnqq229zy6xc3y04xgz47h4cngyz2ykiidm"; + name = "kitemmodels-5.6.0.tar.xz"; + store = "/nix/store/vzbgb344m8j1rsmwmvz08rrqswjqf2kn-kitemmodels-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kded-5.6.0.tar.xz"; + sha256 = "16zl0a1yr5vy18gds1kvw5g1ndl4rv3xgfgwy4bnys65rqw9j4nh"; + name = "kded-5.6.0.tar.xz"; + store = "/nix/store/2cwmng27rxxnkilf5rl61nfmv7f5dwgh-kded-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/attica-5.6.0.tar.xz"; + sha256 = "1qw3fg2pm1zwjc64dmwgqf3w6bn9nhbwa4j1r2mxmsgdvm3m6y80"; + name = "attica-5.6.0.tar.xz"; + store = "/nix/store/1z5gs5p4riv2rzc83np3z2lch6lscbif-attica-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kimageformats-5.6.0.tar.xz"; + sha256 = "0g09cvgr7l4lfhmwscyri2ivndl3kp9w7rnwx9kmqyrbpaq7a5p6"; + name = "kimageformats-5.6.0.tar.xz"; + store = "/nix/store/6fw40sn37h6kb9z58cj08fi0gafpm7il-kimageformats-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kxmlgui-5.6.0.tar.xz"; + sha256 = "18d4bbvygrgxln54xwk3cas8ncpxapwxr4566c2402fm03y1j3zw"; + name = "kxmlgui-5.6.0.tar.xz"; + store = "/nix/store/cz3994azp3y1c9pkybjb6n7vq1fvrrdx-kxmlgui-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kunitconversion-5.6.0.tar.xz"; + sha256 = "1zwmw4m5fa5r48cf28bpygwy3x8vap2xsld1ixnydzzbwc4ry3ix"; + name = "kunitconversion-5.6.0.tar.xz"; + store = "/nix/store/2kx18zpi5vd0j7mdg9yrrqciqqa48bzk-kunitconversion-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kcompletion-5.6.0.tar.xz"; + sha256 = "0zk50qbm7yfjh01c89xg19yc3qji1qdlan60ggwjqabdwfx097vj"; + name = "kcompletion-5.6.0.tar.xz"; + store = "/nix/store/hs0amwz5nrzzx9gc4qlvw23dvacd12ys-kcompletion-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kwallet-5.6.0.tar.xz"; + sha256 = "032yi352fdigdbvlqf6pci9srl6hcfc5gq10s90hvfp25xvyvn1k"; + name = "kwallet-5.6.0.tar.xz"; + store = "/nix/store/6cy8nbhblz788i0sq19vddgmm7kw3vkh-kwallet-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kservice-5.6.0.tar.xz"; + sha256 = "1amwp6vzr4br6a37q2d8krhsvnnhvk2pvccizgml8pmk2kg1jndf"; + name = "kservice-5.6.0.tar.xz"; + store = "/nix/store/cfy088igxfx9p3w0npffidyd53qcf1qz-kservice-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kiconthemes-5.6.0.tar.xz"; + sha256 = "1q06hlgs1sxnklrhdw7qxyfi4fxxjhza4nwc02p2ym1mfgj76afq"; + name = "kiconthemes-5.6.0.tar.xz"; + store = "/nix/store/alg2frgkj7jjy0rgq8d9c9s7ayhsxgmb-kiconthemes-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/threadweaver-5.6.0.tar.xz"; + sha256 = "1ilwwcfczhz60542ivyvr4a1723fliz5mxv75nb0a3nsd8qh662j"; + name = "threadweaver-5.6.0.tar.xz"; + store = "/nix/store/22135n73yf5bgxhpfigk4vbajgqbv8za-threadweaver-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/sonnet-5.6.0.tar.xz"; + sha256 = "0pkc7sck4lpl1ig8xqam91809s49rr70wqhqjmyd823m35134k88"; + name = "sonnet-5.6.0.tar.xz"; + store = "/nix/store/7m3a4g6jbbkqssm1xjzq4qc0axmdlzvw-sonnet-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kcrash-5.6.0.tar.xz"; + sha256 = "0ismn2phd1802hb0vpdc5fn3x8h8p8lzdx1zgg1j5mqx3jddhskz"; + name = "kcrash-5.6.0.tar.xz"; + store = "/nix/store/hbv92rvbxwhb4mbf7skqfq7hv23v39hy-kcrash-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kio-5.6.0.tar.xz"; + sha256 = "06kxl1x96nxkf6pn0hqm5jlpgvj0nzj16d4s3yqh80y8mb3qmy5x"; + name = "kio-5.6.0.tar.xz"; + store = "/nix/store/2p8kx9b47zxcgar5n6cfllxrmxc68k8j-kio-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kapidox-5.6.0.tar.xz"; + sha256 = "1jai9na4v2brvlcb4bc7dghwbii326lp01qn97n4k2gs6gbaz72d"; + name = "kapidox-5.6.0.tar.xz"; + store = "/nix/store/a1wj3qs2a7p9xbhpv1lnj0fp28wbrk0a-kapidox-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kdewebkit-5.6.0.tar.xz"; + sha256 = "18q7z8ly3dgn3vnl42swlaqqhf2ajfa8azz5pjswmfhfnxdh1dw7"; + name = "kdewebkit-5.6.0.tar.xz"; + store = "/nix/store/vigpp6rha2r1062nlkld92cg1kdvdqk4-kdewebkit-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/plasma-framework-5.6.0.tar.xz"; + sha256 = "16xfhqkq29jw9wx3h6s8m3alamqqfff676qdik9kh5xxm9kyf3rq"; + name = "plasma-framework-5.6.0.tar.xz"; + store = "/nix/store/6xm3arrwlsl0w3xrcjxwl55fvhpqy34a-plasma-framework-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kwidgetsaddons-5.6.0.tar.xz"; + sha256 = "179pjyjc8raiga5wv44dwpcjw68b3sc0pyv19rkwdbbym6rwx34d"; + name = "kwidgetsaddons-5.6.0.tar.xz"; + store = "/nix/store/59s52d30qcmlvhrbvzbhkxdm0vbq66k5-kwidgetsaddons-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kglobalaccel-5.6.0.tar.xz"; + sha256 = "12wgv3nhr2c54vh17mqm96hyfvzjbfmm335dqh2ajqg79w7bk46v"; + name = "kglobalaccel-5.6.0.tar.xz"; + store = "/nix/store/yg49hswx9kr7y4rby96yl62cg8qggcld-kglobalaccel-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kparts-5.6.0.tar.xz"; + sha256 = "1fd8kmfg6vyii8s5fx968x404wmmly29xfjlgpc2y5phw26v0jm1"; + name = "kparts-5.6.0.tar.xz"; + store = "/nix/store/mlb24addakwmg79h8j42yaiavfdw3xcj-kparts-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kdesignerplugin-5.6.0.tar.xz"; + sha256 = "0nnxcqzsr4x7z08hz54n30lrbsxcnc14yc64lf8avpjs1cbgg2f6"; + name = "kdesignerplugin-5.6.0.tar.xz"; + store = "/nix/store/9bk81cvs0y7nicnf4z2hggpc2s2iw9mq-kdesignerplugin-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kidletime-5.6.0.tar.xz"; + sha256 = "1byyj89iy20mwy373z5rxhkjc1adbpjjl14a3vqvc80f87x08hd5"; + name = "kidletime-5.6.0.tar.xz"; + store = "/nix/store/8pqylp14nd42qyh42rxhszgnby8dzz69-kidletime-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/ki18n-5.6.0.tar.xz"; + sha256 = "0g9qzisi9hlz61l6qls5xwqkj98h26f5gnphh8pha3rxkh1nzrzm"; + name = "ki18n-5.6.0.tar.xz"; + store = "/nix/store/zhg3dfsqm51137kyvyc0i1qda7vjb82n-ki18n-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kinit-5.6.0.tar.xz"; + sha256 = "1k9frj2myzzjjgg98hh5003zqkch4id3nkc0kqdx113g7walm2xy"; + name = "kinit-5.6.0.tar.xz"; + store = "/nix/store/kwr5nfpm93ngvsp10h1spsz93bb92l07-kinit-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/extra-cmake-modules-1.6.0.tar.xz"; + sha256 = "08nad0mb2bxp2alh562qvpma6f4mkhznfla9p1skdb06kb0gz5s6"; + name = "extra-cmake-modules-1.6.0.tar.xz"; + store = "/nix/store/r6qshq5hxyrrddg7gwgwkpvbci6sxrgi-extra-cmake-modules-1.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/knewstuff-5.6.0.tar.xz"; + sha256 = "0h60fhpc3p4l8889spj33lvwzcqplnlbf2clbwiyjpa1j86sfdf0"; + name = "knewstuff-5.6.0.tar.xz"; + store = "/nix/store/m465k9rzic6ax36m3wpv22wr90d6sm9w-knewstuff-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kitemviews-5.6.0.tar.xz"; + sha256 = "0mjwvi0n55x8xwnbmqw1z6av7vc0gfrs9ljpgi1na4mmk84yqhdd"; + name = "kitemviews-5.6.0.tar.xz"; + store = "/nix/store/vj0ssv01sn36280g64k2dk0pwgzbff9l-kitemviews-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kpackage-5.6.0.tar.xz"; + sha256 = "1wpvg5s0y31iad874xpyw1z78r72b7w56lxbn732imp5bzajmq2v"; + name = "kpackage-5.6.0.tar.xz"; + store = "/nix/store/iq9739r7pzk7zfzvk0599liylkwn9ml4-kpackage-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kcmutils-5.6.0.tar.xz"; + sha256 = "0wzzxq3nid80q4a4wzz2yd3vfc6mzjxbdair263kw1xkxcb2l3ng"; + name = "kcmutils-5.6.0.tar.xz"; + store = "/nix/store/gsamabw9mhda9d3b7zwravfhvviym7gd-kcmutils-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kdeclarative-5.6.0.tar.xz"; + sha256 = "049bknjd383vc4jlmahjrs2mnwdn0jrvz3pkjywlwx7v7ja69l5l"; + name = "kdeclarative-5.6.0.tar.xz"; + store = "/nix/store/zna6r1vkms0ysigsw1xcp0brwmrkkj00-kdeclarative-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kcodecs-5.6.0.tar.xz"; + sha256 = "1l647c89rs3w6laal28hx25s1215jhl911q85jyzhz528rkd1jx6"; + name = "kcodecs-5.6.0.tar.xz"; + store = "/nix/store/iq1vxp7qbyrfdqh1jvfi0iq9zg17bzrm-kcodecs-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kdesu-5.6.0.tar.xz"; + sha256 = "0agr28m80b5rnk3l4sjfcwq9cx4krs8f7nxl9ll13zx62gknwjlk"; + name = "kdesu-5.6.0.tar.xz"; + store = "/nix/store/8vnnjbbpnr52av5cga5y8i5iphmv73r6-kdesu-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/extra-cmake-modules-1.6.1.tar.xz"; + sha256 = "1ri6zvhd6k721y0wigl1928dwhg7bvcqs0ifaddvhn8ql694qvgz"; + name = "extra-cmake-modules-1.6.1.tar.xz"; + store = "/nix/store/vpcwwg988l2647laz0mm4j65szby7yya-extra-cmake-modules-1.6.1.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/karchive-5.6.0.tar.xz"; + sha256 = "0ldgwzzl70k4kvhmzp70r63akyprspcrpdnlafa5irdmfcc3sfzj"; + name = "karchive-5.6.0.tar.xz"; + store = "/nix/store/m75chqjl74piz0miwxj14szwb6834r3z-karchive-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kwindowsystem-5.6.0.tar.xz"; + sha256 = "04qgai4ib2jm2xsmpzm2iszrkma4ns6fn8nkn8m5lbihsrfp6lmz"; + name = "kwindowsystem-5.6.0.tar.xz"; + store = "/nix/store/4a0hdrjz0s172vqnxwz7khysp0yz8pd7-kwindowsystem-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/knotifications-5.6.0.tar.xz"; + sha256 = "1fz0kq8azwc3gdvbr7p07zsrpdsb707cksnzjgnddxm741wzvfr0"; + name = "knotifications-5.6.0.tar.xz"; + store = "/nix/store/r9p9h0ma9v57jpz1iv4gy66jd3wmi0jn-knotifications-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kactivities-5.6.0.tar.xz"; + sha256 = "1mr375w83y8ivcq9fvswwr637ilyrikyv56bkkchyb18y34f1v1i"; + name = "kactivities-5.6.0.tar.xz"; + store = "/nix/store/0yazfjf3kwj7yqh60napp8i1gwp7vssm-kactivities-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kdoctools-5.6.0.tar.xz"; + sha256 = "02vbw530gy1d6mygzrpd5pqdqjww2749q0rkj4dl14va7rw9ksx5"; + name = "kdoctools-5.6.0.tar.xz"; + store = "/nix/store/73xzy82hqayfb303cxxvb0pd1xsm68qi-kdoctools-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/frameworkintegration-5.6.0.tar.xz"; + sha256 = "0kh57h2sxpz8my1wb5xx8xhxsa08nfdg3551dphvabl6mpg1jsqh"; + name = "frameworkintegration-5.6.0.tar.xz"; + store = "/nix/store/vljg38z53y37xafjvv7xhfnhb2cfhwby-frameworkintegration-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kauth-5.6.0.tar.xz"; + sha256 = "0rnwh9cnn3nsk980grl1ycldpr61ihksmphcvq1jj0lpdgw80zan"; + name = "kauth-5.6.0.tar.xz"; + store = "/nix/store/khb8pfz5qn40mrfh859n4fp6qcv593ib-kauth-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/knotifyconfig-5.6.0.tar.xz"; + sha256 = "0ifsnj9gm7fgwd2rb34xqnfy4hxyxr2wgyjd8ryywnp1zf4b6hfi"; + name = "knotifyconfig-5.6.0.tar.xz"; + store = "/nix/store/3mn9094lflb8larwzgz7p8hgf40kgq1a-knotifyconfig-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/solid-5.6.0.tar.xz"; + sha256 = "1lnn6134s2zagcy1qcyxsr4nv31fxafmyk2cil70a0pmpq7ywyw4"; + name = "solid-5.6.0.tar.xz"; + store = "/nix/store/550z8fj4vabpds4d3kzn04mmhi6rb813-solid-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/networkmanager-qt-5.6.0.tar.xz"; + sha256 = "0iwdzb75psvw4b1rg7ijrgz9kijiik7n4grryyib2nvwwgzna3lv"; + name = "networkmanager-qt-5.6.0.tar.xz"; + store = "/nix/store/m48q6fc34yxmiv02qmww8xdh2nrpzk6g-networkmanager-qt-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/portingAids/khtml-5.6.0.tar.xz"; + sha256 = "1i6v3m7wkdj8cpqdp74mxhyyhq1qq8k80vsxjm1nzaqxgwq8gfvq"; + name = "khtml-5.6.0.tar.xz"; + store = "/nix/store/mlrqylbwp2bj7l70fxlkw0a6dcgd3q6x-khtml-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/portingAids/kmediaplayer-5.6.0.tar.xz"; + sha256 = "0z66a2yb4i9q2mk14szs4z8832jl33awaqima9b9xsdh5w4q6llk"; + name = "kmediaplayer-5.6.0.tar.xz"; + store = "/nix/store/47908hvamfll3wn0rbacp455zvs0sv4g-kmediaplayer-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/portingAids/kjsembed-5.6.0.tar.xz"; + sha256 = "08g3ac02c4vi010036kz0jgsmhv7c0s4xxk05pmkm6i7hrnslv7g"; + name = "kjsembed-5.6.0.tar.xz"; + store = "/nix/store/m0is4ahl2rsv4gzwarim4bw1jzzrddmm-kjsembed-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/portingAids/kross-5.6.0.tar.xz"; + sha256 = "0pwscrk89apvysfgr596yb9vywdc6l6dsrhgxmmsplh6v3nqknph"; + name = "kross-5.6.0.tar.xz"; + store = "/nix/store/54p2ms8fjiikpcz15amg1kkip7ddpqfq-kross-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/portingAids/krunner-5.6.0.tar.xz"; + sha256 = "09c11c43pw4hm59h1nixs2bqs22iwvc728fgm7hhmp76xv8vw5sf"; + name = "krunner-5.6.0.tar.xz"; + store = "/nix/store/2bbpl3pkd9h9di2ihlj3ab8gaxjvkfx5-krunner-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/portingAids/kjs-5.6.0.tar.xz"; + sha256 = "0gizs498q2rjmlqgpwh7p1kb3bwdfif28fscya1i6jakdgl8s94c"; + name = "kjs-5.6.0.tar.xz"; + store = "/nix/store/2y2dd7s775c1699g13fbaz5b3pgb079g-kjs-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/portingAids/kdelibs4support-5.6.0.tar.xz"; + sha256 = "057zvf1b6k8gfs19yz90fxj1jzyc2f1pyh03mhbj3a77sph82qc9"; + name = "kdelibs4support-5.6.0.tar.xz"; + store = "/nix/store/flmn2ls5rqyj6hh98c2vvvzmb7lx36a3-kdelibs4support-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kcoreaddons-5.6.0.tar.xz"; + sha256 = "07z29viwijwmgashwxhz3j9pw9ksvsjywz88871nmggbw8544x0r"; + name = "kcoreaddons-5.6.0.tar.xz"; + store = "/nix/store/8j6zx7269w1z64wblpg0p8f9kc046qrn-kcoreaddons-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kemoticons-5.6.0.tar.xz"; + sha256 = "1hq1dqhnj8zvna37pbi9xavc3ad41q5ayxb4gn6rn4hglg94fv68"; + name = "kemoticons-5.6.0.tar.xz"; + store = "/nix/store/63488dvgv4qpf60wkhmwrwylq09gnkq2-kemoticons-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kdnssd-5.6.0.tar.xz"; + sha256 = "0cpfazdq7l9v29bjq08dj6kf8d1g8fjfq4aqljqzlzn4grsmjksq"; + name = "kdnssd-5.6.0.tar.xz"; + store = "/nix/store/rwdp52gpbyaak9r89lkj27mgbjhk8dhn-kdnssd-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kplotting-5.6.0.tar.xz"; + sha256 = "0hj66zshpnaabvjhi4183fh4xhqg95sv8jjlmzwdzac7ipn09r0c"; + name = "kplotting-5.6.0.tar.xz"; + store = "/nix/store/4jrjvkz1dclccnwhqzh0sjia79d0bs4s-kplotting-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kconfigwidgets-5.6.0.tar.xz"; + sha256 = "0fb1sxjcqfgvli5ndm03sqadrhqgsk841y6cql0grpyyx42b2s3s"; + name = "kconfigwidgets-5.6.0.tar.xz"; + store = "/nix/store/40sc8j052cpqsk663icz6x426jac6v2b-kconfigwidgets-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kpty-5.6.0.tar.xz"; + sha256 = "02n2i4q2wasjkrivc80srs208zlgkhi0v7xxcx49xv2djhcm71nb"; + name = "kpty-5.6.0.tar.xz"; + store = "/nix/store/zw7lvzy73w9ffv79jmckr52bw7xsgza6-kpty-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kbookmarks-5.6.0.tar.xz"; + sha256 = "00qn6jgz1zzz0bbj0z6ki7wcb4q611szvnmif1n7sdmmcczd2b3l"; + name = "kbookmarks-5.6.0.tar.xz"; + store = "/nix/store/qbi1yankzvx098cfksx8wdxh0zv0jqx3-kbookmarks-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/ktexteditor-5.6.0.tar.xz"; + sha256 = "1s57bpr7bb2c4xw384lkik7pbwa21v1ma4vriv3dz91q029qjxgs"; + name = "ktexteditor-5.6.0.tar.xz"; + store = "/nix/store/c4hfl2yny47mxa8iil5xxqwrzwwlfqpl-ktexteditor-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kguiaddons-5.6.0.tar.xz"; + sha256 = "08md1bch0cdd9ywc1g46ia1h1vqv74s36ar5x9if12jfkhiss13i"; + name = "kguiaddons-5.6.0.tar.xz"; + store = "/nix/store/1riwgwy3yw3n0zi1q7k3rnf3s37d397f-kguiaddons-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/ktextwidgets-5.6.0.tar.xz"; + sha256 = "0b6q7mbdfjfzi3hb2qbjqnmdhycabsiqnrz66l2xa78phmwydvss"; + name = "ktextwidgets-5.6.0.tar.xz"; + store = "/nix/store/442l5jhr4vij2gnnbhf30q98xmyzd6m2-ktextwidgets-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kjobwidgets-5.6.0.tar.xz"; + sha256 = "16l2xhlqvavzjf9hfjdz3pssa3sjdv6bvmk9dp9prf7j39pxhnw6"; + name = "kjobwidgets-5.6.0.tar.xz"; + store = "/nix/store/9hxzz693csamkrx8x6m7lrm5m76vx0nb-kjobwidgets-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/frameworks/5.6/kconfig-5.6.0.tar.xz"; + sha256 = "06rx3hwc3hay0g8pnzm9l7mdwk4pqy3waspncdlknabaxcvqmf0a"; + name = "kconfig-5.6.0.tar.xz"; + store = "/nix/store/26q4zhd6m4jjshknmd2r0dgxmscbgncr-kconfig-5.6.0.tar.xz"; + } +] diff --git a/pkgs/development/libraries/kde-frameworks-5.6/manifest.sh b/pkgs/development/libraries/kde-frameworks-5.6/manifest.sh new file mode 100755 index 00000000000..d6d7ccae6a5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.6/manifest.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +if [ $# -eq 0 ]; then + + # The extra slash at the end of the URL is necessary to stop wget + # from recursing over the whole server! (No, it's not a bug.) + $(nix-build ../../../.. -A autonix.manifest) \ + http://download.kde.org/stable/frameworks/5.6/ \ + -A '*.tar.xz' + +else + + $(nix-build ../../../.. -A autonix.manifest) -A '*.tar.xz' "$@" + +fi diff --git a/pkgs/development/libraries/kde-frameworks-5.6/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.6/plasma-framework/plasma-framework-external-paths.patch new file mode 100644 index 00000000000..9a22c0bdbcd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.6/plasma-framework/plasma-framework-external-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp +index 07b3c90..84417e3 100644 +--- a/src/plasma/package.cpp ++++ b/src/plasma/package.cpp +@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate() + servicePrefix("plasma-applet-"), + fallbackPackage(0), + metadata(0), +- externalPaths(false), ++ externalPaths(true), + valid(false), + checkedValid(false) + { diff --git a/pkgs/development/libraries/kde-frameworks-5.6/renames.nix b/pkgs/development/libraries/kde-frameworks-5.6/renames.nix new file mode 100644 index 00000000000..58ade4e62ac --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.6/renames.nix @@ -0,0 +1,68 @@ +# DO NOT EDIT! This file is generated automatically. +{ }: +{ +"Backend" = "plasma-framework"; +"CTest" = "attica"; +"ECM" = "extra-cmake-modules"; +"KDED" = "kded"; +"KF5Activities" = "kactivities"; +"KF5Archive" = "karchive"; +"KF5Attica" = "attica"; +"KF5Auth" = "kauth"; +"KF5Bookmarks" = "kbookmarks"; +"KF5Codecs" = "kcodecs"; +"KF5Completion" = "kcompletion"; +"KF5Config" = "kconfig"; +"KF5ConfigWidgets" = "kconfigwidgets"; +"KF5CoreAddons" = "kcoreaddons"; +"KF5Crash" = "kcrash"; +"KF5DBusAddons" = "kdbusaddons"; +"KF5DNSSD" = "kdnssd"; +"KF5Declarative" = "kdeclarative"; +"KF5DesignerPlugin" = "kdesignerplugin"; +"KF5DocTools" = "kdoctools"; +"KF5Emoticons" = "kemoticons"; +"KF5FrameworkIntegration" = "frameworkintegration"; +"KF5GlobalAccel" = "kglobalaccel"; +"KF5GuiAddons" = "kguiaddons"; +"KF5I18n" = "ki18n"; +"KF5IconThemes" = "kiconthemes"; +"KF5IdleTime" = "kidletime"; +"KF5Init" = "kinit"; +"KF5ItemModels" = "kitemmodels"; +"KF5ItemViews" = "kitemviews"; +"KF5JS" = "kjs"; +"KF5JobWidgets" = "kjobwidgets"; +"KF5JsEmbed" = "kjsembed"; +"KF5KCMUtils" = "kcmutils"; +"KF5KDE4Support" = "kdelibs4support"; +"KF5KDELibs4Support" = "kdelibs4support"; +"KF5KHtml" = "khtml"; +"KF5KIO" = "kio"; +"KF5Kross" = "kross"; +"KF5MediaPlayer" = "kmediaplayer"; +"KF5NetworkManagerQt" = "networkmanager-qt"; +"KF5NewStuff" = "knewstuff"; +"KF5Notifications" = "knotifications"; +"KF5NotifyConfig" = "knotifyconfig"; +"KF5Package" = "kpackage"; +"KF5Parts" = "kparts"; +"KF5Plasma" = "plasma-framework"; +"KF5PlasmaQuick" = "plasma-framework"; +"KF5Plotting" = "kplotting"; +"KF5Pty" = "kpty"; +"KF5Runner" = "krunner"; +"KF5Service" = "kservice"; +"KF5Solid" = "solid"; +"KF5Sonnet" = "sonnet"; +"KF5Su" = "kdesu"; +"KF5TextEditor" = "ktexteditor"; +"KF5TextWidgets" = "ktextwidgets"; +"KF5ThreadWeaver" = "threadweaver"; +"KF5UnitConversion" = "kunitconversion"; +"KF5Wallet" = "kwallet"; +"KF5WebKit" = "kdewebkit"; +"KF5WidgetsAddons" = "kwidgetsaddons"; +"KF5WindowSystem" = "kwindowsystem"; +"KF5XmlGui" = "kxmlgui"; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.6/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.6/setup-hook.sh new file mode 100644 index 00000000000..a8d9b7e0e36 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.6/setup-hook.sh @@ -0,0 +1 @@ +addToSearchPath XDG_DATA_DIRS @out@/share diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2f1e36e0ff..5f2c372446f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5814,7 +5814,10 @@ let kf55 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.5 { stdenv = overrideGCC stdenv gccStdInc; }); - kf5_latest = kf55; + kf56 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.6 { + stdenv = overrideGCC stdenv gccStdInc; + }); + kf5_latest = kf56; kf5_stable = kf55; krb5 = callPackage ../development/libraries/kerberos/krb5.nix { From a47cfb4ac6d32eed5747c6381d56cb26965e89db Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 27 Jan 2015 22:16:31 -0600 Subject: [PATCH 2/4] add plasma-5.2 --- pkgs/desktops/plasma-5.2/default.nix | 167 ++++++++ pkgs/desktops/plasma-5.2/dependencies.nix | 284 +++++++++++++ pkgs/desktops/plasma-5.2/dependencies.sh | 22 + .../kwin-import-plugin-follow-symlinks.patch | 13 + .../libkscreen/libkscreen-backend-path.patch | 130 ++++++ pkgs/desktops/plasma-5.2/manifest.nix | 214 ++++++++++ pkgs/desktops/plasma-5.2/manifest.sh | 15 + .../plasma-desktop-hwclock.patch | 24 ++ .../plasma-desktop-zoneinfo.patch | 18 + pkgs/desktops/plasma-5.2/renames.nix | 23 ++ pkgs/desktops/plasma-5.2/setup-hook.sh | 1 + pkgs/desktops/plasma-5.2/startkde/default.nix | 33 ++ pkgs/desktops/plasma-5.2/startkde/kdeglobals | 11 + pkgs/desktops/plasma-5.2/startkde/startkde.in | 382 ++++++++++++++++++ .../plasma-5.2/startkde/startupconfigkeys | 5 + .../libraries/kde-frameworks-5.6/default.nix | 2 +- pkgs/top-level/all-packages.nix | 6 +- 17 files changed, 1348 insertions(+), 2 deletions(-) create mode 100644 pkgs/desktops/plasma-5.2/default.nix create mode 100644 pkgs/desktops/plasma-5.2/dependencies.nix create mode 100755 pkgs/desktops/plasma-5.2/dependencies.sh create mode 100644 pkgs/desktops/plasma-5.2/kwin/kwin-import-plugin-follow-symlinks.patch create mode 100644 pkgs/desktops/plasma-5.2/libkscreen/libkscreen-backend-path.patch create mode 100644 pkgs/desktops/plasma-5.2/manifest.nix create mode 100755 pkgs/desktops/plasma-5.2/manifest.sh create mode 100644 pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-hwclock.patch create mode 100644 pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-zoneinfo.patch create mode 100644 pkgs/desktops/plasma-5.2/renames.nix create mode 100644 pkgs/desktops/plasma-5.2/setup-hook.sh create mode 100644 pkgs/desktops/plasma-5.2/startkde/default.nix create mode 100644 pkgs/desktops/plasma-5.2/startkde/kdeglobals create mode 100644 pkgs/desktops/plasma-5.2/startkde/startkde.in create mode 100644 pkgs/desktops/plasma-5.2/startkde/startupconfigkeys diff --git a/pkgs/desktops/plasma-5.2/default.nix b/pkgs/desktops/plasma-5.2/default.nix new file mode 100644 index 00000000000..28bdc26bd4e --- /dev/null +++ b/pkgs/desktops/plasma-5.2/default.nix @@ -0,0 +1,167 @@ +# 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. + +{ autonix, kf56, pkgs, stdenv, debug ? false }: + +with stdenv.lib; with autonix; + +let + + kf5 = kf56.override { inherit debug; }; + + inherit (kf5) qt5; + + mirror = "mirror://kde"; + + renames = + builtins.removeAttrs + (import ./renames.nix {}) + ["Backend" "CTest"]; + + scope = + # packages in this collection + (mapAttrs (dep: name: plasma5."${name}") renames) // + # packages from KDE Frameworks 5 + kf5.scope // + # packages pinned to this version of Qt 5 + { + LibBlueDevil = pkgs.libbluedevil; + PolkitQt5-1 = pkgs.polkit_qt5.override { inherit qt5; }; + PopplerQt5 = (pkgs.poppler.override { inherit (kf5) qt5; }).poppler_qt5; + } // + # packages from nixpkgs + (with pkgs; + { + inherit epoxy; + Epub = ebook_tools; + Exiv2 = exiv2; + FFmpeg = ffmpeg; + FONTFORGE_EXECUTABLE = fontforge; + Freetype = freetype; + GTK2 = gtk2; + GTK3 = gtk3; + Libinput = libinput; + LibSSH = libssh; + ModemManager = modemmanager; + NetworkManager = networkmanager; + PulseAudio = pulseaudio; + Taglib = taglib; + USB = libusb; + Wayland = wayland; + Xapian = xapian; + } + ); + + preResolve = super: + fold (f: x: f x) super + [ + (userEnvPkg "SharedMimeInfo") + (userEnvPkg "SharedDesktopOntologies") + (blacklist ["bluedevil"]) + ]; + + postResolve = super: + (builtins.removeAttrs super ["breeze"]) // { + + breeze-qt4 = with pkgs; super.breeze // { + name = "breeze-qt4-" + (builtins.parseDrvName super.breeze.name).version; + buildInputs = [ xlibs.xproto kde4.kdelibs qt4 ]; + nativeBuildInputs = [ cmake pkgconfig ]; + cmakeFlags = + [ + "-DUSE_KDE4=ON" + "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake" + ]; + }; + + breeze-qt5 = with pkgs; super.breeze // { + name = "breeze-qt5-" + (builtins.parseDrvName super.breeze.name).version; + buildInputs = with kf5; with plasma5; + [ + kcompletion kconfig kconfigwidgets kcoreaddons kdecoration + frameworkintegration ki18n kwindowsystem qt5 + ]; + nativeBuildInputs = [ cmake kf5.extra-cmake-modules pkgconfig ]; + cmakeFlags = [ "-DUSE_KDE4=OFF" ]; + }; + + kde-gtk-config = with pkgs; super.kde-gtk-config // { + NIX_CFLAGS_COMPILE = + (super.kde-gtk-config.NIX_CFLAGS_COMPILE or "") + + " -I${cairo}/include/cairo" + + " -I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include" + + " -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include" + + " -I${pango}/include/pango-1.0"; + }; + + kwin = with pkgs; super.kwin // { + buildInputs = with xlibs; + super.kwin.buildInputs ++ [ libICE libSM libXcursor ]; + patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ]; + }; + + libkscreen = with pkgs; super.libkscreen // { + buildInputs = with xlibs; super.libkscreen.buildInputs ++ [libXrandr]; + }; + + plasma-desktop = with pkgs; super.plasma-desktop // { + buildInputs = with xlibs; + super.plasma-desktop.buildInputs ++ + [ pkgs.libcanberra libxkbfile libXcursor libXft ]; + patches = [ + ./plasma-desktop/plasma-desktop-hwclock.patch + ./plasma-desktop/plasma-desktop-zoneinfo.patch + ]; + preConfigure = '' + substituteInPlace kcms/dateandtime/helper.cpp \ + --subst-var-by hwclock "${utillinux}/sbin/hwclock" + ''; + enableParallelBuilding = false; + NIX_CFLAGS_COMPILE = + (super.plasma-desktop.NIX_CFLAGS_COMPILE or "") + + " -Wno-error=return-type"; + }; + + plasma-workspace = with pkgs; super.plasma-workspace // { + buildInputs = with xlibs; + super.plasma-workspace.buildInputs ++ [ libSM libXcursor pam ]; + postInstall = '' + # We use a custom startkde script + rm $out/bin/startkde + ''; + }; + + powerdevil = with pkgs; super.powerdevil // { + buildInputs = with xlibs; super.powerdevil.buildInputs ++ [libXrandr]; + }; + + sddm-kcm = with pkgs; super.sddm-kcm // { + buildInputs = with xlibs; super.sddm-kcm.buildInputs ++ [libXcursor]; + }; + + }; + + plasma5 = generateCollection ./. { + inherit (kf5) mkDerivation; + inherit mirror preResolve postResolve renames scope; + }; + +in + plasma5 // { + inherit scope; + startkde = pkgs.callPackage ./startkde { + inherit (kf5) kconfig kinit kservice; + inherit (plasma5) plasma-desktop plasma-workspace; + }; + } diff --git a/pkgs/desktops/plasma-5.2/dependencies.nix b/pkgs/desktops/plasma-5.2/dependencies.nix new file mode 100644 index 00000000000..74e519927d0 --- /dev/null +++ b/pkgs/desktops/plasma-5.2/dependencies.nix @@ -0,0 +1,284 @@ +# DO NOT EDIT! This file is generated automatically. +{ }: +{ + baloo = { + buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5Crash" "KF5FileMetaData" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5Solid" "Qt5" "Xapian" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5CoreAddons" "KF5FileMetaData" "Qt5Core" "Xapian" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + bluedevil = { + buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5MODULE" "KF5Notifications" "KF5WidgetsAddons" "LibBlueDevil" "Qt5" "SharedMimeInfo" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ "SharedMimeInfo" ]; + }; + + breeze = { + buildInputs = [ "ECM" "KDE4" "KDecoration2" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5I18n" "KF5Service" "KF5WindowSystem" "PkgConfig" "Qt5" "XCB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kde-cli-tools = { + buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5Su" "KF5WindowSystem" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kde-gtk-config = { + buildInputs = [ "ECM" "GTK2" "GTK3" "KF5" "KF5Archive" "KF5ConfigWidgets" "KF5I18n" "KF5KCMUtils" "KF5NewStuff" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kdecoration = { + buildInputs = [ "ECM" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Gui" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kdeplasma-addons = { + buildInputs = [ "ECM" "GIO" "GLIB2" "GObject" "IBus" "KDE4" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Kross" "KF5Plasma" "KF5Runner" "KF5Service" "KF5UnitConversion" "KdepimLibs" "Kexiv2" "Lancelot" "Lancelot-Datamodels" "Qt5" "Qt5X11Extras" "SCIM" "SharedMimeInfo" "X11" "XCB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ "SharedMimeInfo" ]; + }; + + kfilemetadata = { + buildInputs = [ "ECM" "EPub" "Exiv2" "FFmpeg" "KF5" "KF5Archive" "KF5I18n" "PopplerQt5" "QMobipocket" "Qt5" "Taglib" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + khelpcenter = { + buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KHtml" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + khotkeys = { + buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Plasma" "KF5XmlGui" "LibKWorkspace" "Qt5" "X11" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kinfocenter = { + buildInputs = [ "ECM" "EGL" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Service" "KF5Solid" "KF5Wayland" "KF5WidgetsAddons" "KF5XmlGui" "OpenGL" "OpenGLES" "PCIUTILS" "Qt5" "RAW1394" "X11" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kio-extras = { + buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Archive" "KF5Bookmarks" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DNSSD" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KHtml" "KF5KIO" "KF5Pty" "KF5Solid" "LibSSH" "Mtp" "OpenEXR" "Phonon4Qt5" "Qt5" "Qt5Test" "SLP" "Samba" "SharedMimeInfo" ]; + nativeBuildInputs = [ "MD5SUM_EXECUTABLE" "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ "SharedMimeInfo" ]; + }; + + kmenuedit = { + buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KIO" "KF5Sonnet" "KF5XmlGui" "KHotKeysDBusInterface" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kscreen = { + buildInputs = [ "ECM" "KF5" "KF5ConfigWidgets" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5Screen" "KF5XmlGui" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + ksshaskpass = { + buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5Wallet" "KF5WidgetsAddons" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + ksysguard = { + buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDELibs4Support" "KF5NewStuff" "KF5SysGuard" "Qt5" "Sensors" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kwayland = { + buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Widgets" "Wayland" "WaylandScanner" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Gui" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kwin = { + buildInputs = [ "ECM" "EGL" "KDecoration2" "KF5" "KF5Activities" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Wayland" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Libinput" "Qt5" "Qt5Multimedia" "Qt5Test" "UDev" "Wayland" "X11" "XCB" "XKB" "epoxy" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kwrited = { + buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5Notifications" "KF5Pty" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + libbluedevil = { + buildInputs = [ "Doxygen" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + libkscreen = { + buildInputs = [ "Doxygen" "ECM" "Qt5" "X11" "XCB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + libksysguard = { + buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5Plasma" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5WebKitWidgets" "Qt5X11Extras" "X11" "ZLIB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Config" "KF5I18n" "KF5IconThemes" "Qt5Core" "Qt5Network" "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + libmm-qt = { + buildInputs = [ "ECM" "KF5ModemManagerQt" "ModemManager" "Qt4" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + milou = { + buildInputs = [ "ECM" "KF5" "KF5Declarative" "KF5I18n" "KF5Plasma" "KF5Runner" "KdepimLibs" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + muon = { + buildInputs = [ "AkabeiClient" "AppstreamQt" "BODEGA" "DebconfKDE" "ECM" "KF5" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5KDELibs4Support" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "Phonon4Qt5" "QApt" "Qca-qt5" "Qt5" "QtOAuth" "packagekitqt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + oxygen = { + buildInputs = [ "ECM" "KDE4" "KDE4Workspace" "KF5" "KF5Completion" "KF5Config" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "PkgConfig" "Qt5" "XCB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + oxygen-fonts = { + buildInputs = [ "ECM" ]; + nativeBuildInputs = [ "FONTFORGE_EXECUTABLE" "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + plasma-desktop = { + buildInputs = [ "Boost" "ECM" "Fontconfig" "Freetype" "GLIB2" "KDE4" "KF5" "KF5Activities" "KF5Attica" "KF5Auth" "KF5Baloo" "KF5DocTools" "KF5Emoticons" "KF5I18n" "KF5ItemModels" "KF5KCMUtils" "KF5KDELibs4Support" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Wallet" "KRunnerAppDBusInterface" "KSMServerDBusInterface" "KWinDBusInterface" "LibKWorkspace" "LibTaskManager" "OpenGL" "OpenGLES" "PackageKitQt5" "Phonon4Qt5" "PulseAudio" "Qt4" "Qt5" "ScreenSaverDBusInterface" "Strigi" "USB" "X11" "XCB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + plasma-nm = { + buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5ModemManagerQt" "KF5NetworkManagerQt" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "MobileBroadbandProviderInfo" "ModemManager" "NetworkManager" "OpenConnect" "OpenSSL" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + plasma-workspace = { + buildInputs = [ "ECM" "KF5" "KF5Activities" "KF5Baloo" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5JsEmbed" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5NO_MODULE" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Screen" "KF5Solid" "KF5Su" "KF5SysGuard" "KF5TextEditor" "KF5TextWidgets" "KF5Wallet" "KF5Wayland" "KF5WebKit" "KWinDBusInterface" "Phonon4Qt5" "Prison" "Qalculate" "Qt5" "Qt5DBus" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Test" "Qt5WebKitWidgets" "Wayland" "WaylandScanner" "X11" "XCB" "ZLIB" "dbusmenu-qt5" "libgps" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5KIO" "KF5SysGuard" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + plasma-workspace-wallpapers = { + buildInputs = [ "ECM" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + polkit-kde-agent = { + buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5WidgetsAddons" "KF5WindowSystem" "PolkitQt5-1" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + powerdevil = { + buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5NotifyConfig" "KF5Solid" "LibKWorkspace" "Qt5" "ScreenSaverDBusInterface" "UDev" "X11" "XCB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + sddm-kcm = { + buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5XmlGui" "Qt5" "X11" "XCB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + systemsettings = { + buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KCMUtils" "KF5KHtml" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + +} diff --git a/pkgs/desktops/plasma-5.2/dependencies.sh b/pkgs/desktops/plasma-5.2/dependencies.sh new file mode 100755 index 00000000000..e614efc5475 --- /dev/null +++ b/pkgs/desktops/plasma-5.2/dependencies.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +# This script rebuilds dependencies.nix. +# You must run manifest.sh first to download the packages. + +# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs. +# If you are working on the packages, this is probably what you want. + +# You can also pass the path to a source tree where you have built +# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is +# probably what you want. + +manifestXML=$(nix-build -E 'with (import ../../.. {}); autonix.writeManifestXML ./manifest.nix') + +autonixDepsKf5="" +if [[ -z $1 ]]; then + autonixDepsKF5=$(nix-build ../../.. -A haskellngPackages.autonix-deps-kf5)/bin +else + autonixDepsKF5="$1/dist/build/kf5-deps" +fi + +exec ${autonixDepsKF5}/kf5-deps "${manifestXML}" diff --git a/pkgs/desktops/plasma-5.2/kwin/kwin-import-plugin-follow-symlinks.patch b/pkgs/desktops/plasma-5.2/kwin/kwin-import-plugin-follow-symlinks.patch new file mode 100644 index 00000000000..fd1f35d717e --- /dev/null +++ b/pkgs/desktops/plasma-5.2/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.2/libkscreen/libkscreen-backend-path.patch b/pkgs/desktops/plasma-5.2/libkscreen/libkscreen-backend-path.patch new file mode 100644 index 00000000000..d5797924d23 --- /dev/null +++ b/pkgs/desktops/plasma-5.2/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.2/manifest.nix b/pkgs/desktops/plasma-5.2/manifest.nix new file mode 100644 index 00000000000..5eb5d3ff78f --- /dev/null +++ b/pkgs/desktops/plasma-5.2/manifest.nix @@ -0,0 +1,214 @@ +# This file is generated automatically. DO NOT EDIT! +{ mirror }: +[ + { + url = "${mirror}/stable/plasma/5.2.0/ksshaskpass-5.2.0.tar.xz"; + sha256 = "17xjlb1gwxcdxzfadv0brr6ainnw25m681p013na182zigx9f9bv"; + name = "ksshaskpass-5.2.0.tar.xz"; + store = "/nix/store/gv341fwlrzw3svd2vr5b8wxcjk93r64v-ksshaskpass-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/kio-extras-5.2.0.tar.xz"; + sha256 = "1c5qhp6axzbn5mla9q6qk0aalm0n4hvs6c4d9pclbcv58ysv3vw5"; + name = "kio-extras-5.2.0.tar.xz"; + store = "/nix/store/iilra8kczb0waqigff390x2j2svkv5ba-kio-extras-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/kmenuedit-5.2.0.tar.xz"; + sha256 = "1qg7dh42lyp6mrckxjz07mmhk589d3wr080vljbm6hkgqm3aq7zr"; + name = "kmenuedit-5.2.0.tar.xz"; + store = "/nix/store/4qcwcvnyqnpa6b7my8aqrp6v2zadz91m-kmenuedit-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/libbluedevil-5.2.0.tar.xz"; + sha256 = "0s06kn9aqkyyfj1n6cb2hhnnqymwzljavfwj0f88mrkjrdf65bq9"; + name = "libbluedevil-5.2.0.tar.xz"; + store = "/nix/store/d7nkh5p51ab5ag94yi3ggxjpbwn2k6g3-libbluedevil-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/libkscreen-5.2.0.tar.xz"; + sha256 = "1v75qi7b0m8fqdj5b38ypwgp1djkg408a4csn57y3pjgp7k69k53"; + name = "libkscreen-5.2.0.tar.xz"; + store = "/nix/store/49pgxmxbn2qs5dzgf3iiwcaazj9ipiy3-libkscreen-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/kde-gtk-config-5.2.0.tar.xz"; + sha256 = "1gafqrb5sg6jm4g3kivnwax05lq6gilzg8pc8k6dsnchyqzilbki"; + name = "kde-gtk-config-5.2.0.tar.xz"; + store = "/nix/store/vf2cvrr4p7ydz36ir0cjd3p0yqa3cwpj-kde-gtk-config-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/kdeplasma-addons-5.2.0.tar.xz"; + sha256 = "168bl9g1s9piy0bwrx7f8pbvn3jamw1rp90rihydamm3s54p1ykw"; + name = "kdeplasma-addons-5.2.0.tar.xz"; + store = "/nix/store/4qgb1w08k6ffyipfwbrj19pgpihg3pk7-kdeplasma-addons-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/plasma-desktop-5.2.0.tar.xz"; + sha256 = "0xld7kxa8p78kw5f1a75nc0n69jn6vfp8nm40qqdhy2y3m5cc8p9"; + name = "plasma-desktop-5.2.0.tar.xz"; + store = "/nix/store/sjqqnbp8s802rz6ydn3if77hr57njwpk-plasma-desktop-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/systemsettings-5.2.0.tar.xz"; + sha256 = "0yk1zn0kkjb9rcmqa2n10igcnk2fm06gfn7fgb4mcb2vjvv7a8y0"; + name = "systemsettings-5.2.0.tar.xz"; + store = "/nix/store/b0pjfkpqsvfywawinn6a3q42r675q0gw-systemsettings-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/polkit-kde-agent-1-5.2.0.tar.xz"; + sha256 = "14b5z2ijlrv7h2bh6dxyd6r4qschzh1l2iqix63nbfa5nxyfc67q"; + name = "polkit-kde-agent-1-5.2.0.tar.xz"; + store = "/nix/store/ri0bgnblm2s7jsyvarvn0nrmnsgbv9wv-polkit-kde-agent-1-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/milou-5.2.0.tar.xz"; + sha256 = "02gd7012zbiaxhb6wliapfcb4spjrdgnhvhl3y64ixqrx2b032a5"; + name = "milou-5.2.0.tar.xz"; + store = "/nix/store/gsmn9sv15f7iwk8hbh074rnm03ig5yhi-milou-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/kinfocenter-5.2.0.tar.xz"; + sha256 = "151flq4w6m94jgfrzbf3w3v11xybx92xd0nv0bdh5vvaxg97dac9"; + name = "kinfocenter-5.2.0.tar.xz"; + store = "/nix/store/xfnj3gy03ynfaazy82gkxijm9fykwk4x-kinfocenter-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/kdecoration-5.2.0.tar.xz"; + sha256 = "135i1maqp0q9aa312l0dqfkmxjq12mri2zjwg03wzgmmy5b9wm52"; + name = "kdecoration-5.2.0.tar.xz"; + store = "/nix/store/dqqb6cvwcd43yanifka0kmx1pdhryjcj-kdecoration-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/kde-cli-tools-5.2.0.tar.xz"; + sha256 = "0lr3ir8kfq1x0yn0ahhlks0ikxxqbyj6jdmkdlr8hz5ivcpr64mq"; + name = "kde-cli-tools-5.2.0.tar.xz"; + store = "/nix/store/zfnbl0kbh4x3lpalc7irjgynl53mcf52-kde-cli-tools-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/kscreen-5.2.0.tar.xz"; + sha256 = "09f77vszpni93ahm31gsb7lg4lidchppa1kd9s8q98yf2rb9hl55"; + name = "kscreen-5.2.0.tar.xz"; + store = "/nix/store/w2gq2s7lgf637qn0f5a0dh06i7mkjhki-kscreen-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/plasma-workspace-wallpapers-5.2.0.tar.xz"; + sha256 = "1xb500w5y9jn6xyayw5v28qsy6xp0pfb3ydciga77h1xd59wp0ym"; + name = "plasma-workspace-wallpapers-5.2.0.tar.xz"; + store = "/nix/store/3rzwgwlzbmin9sjpp614bavjmrqqwk9x-plasma-workspace-wallpapers-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/sddm-kcm-5.2.0.tar.xz"; + sha256 = "0ds4qlgwzbpa32w3mlhf64p64n1jifm6797v6jb5v3qjnamlpk96"; + name = "sddm-kcm-5.2.0.tar.xz"; + store = "/nix/store/q3wbyymqnxwcv9c58fxc4fg2c6pc2d5r-sddm-kcm-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/libksysguard-5.2.0.tar.xz"; + sha256 = "0jfyy90zdajpxy5yy9w14n8r8jx7d6bdwss7h8rrkp5zljp9nzwp"; + name = "libksysguard-5.2.0.tar.xz"; + store = "/nix/store/n50iq06yz6z2n2n7wh10ww7cks22zz4z-libksysguard-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/oxygen-5.2.0.tar.xz"; + sha256 = "1wad5m36h31y99v4gwx19n3k14xxc0hvp9c4n3g67fyy8pjnr0ax"; + name = "oxygen-5.2.0.tar.xz"; + store = "/nix/store/60kb2hhwlmykfx5mc2s8hyd8zh6ngrpv-oxygen-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/khelpcenter-5.2.0.tar.xz"; + sha256 = "1a5z2bvxjdwp81jnyrdf7q591k6ql504argl7lg3pbvph08rc0rs"; + name = "khelpcenter-5.2.0.tar.xz"; + store = "/nix/store/dfi8w8dsk5cxbyhm5kznja6kxda23n8j-khelpcenter-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/baloo-5.6.0.tar.xz"; + sha256 = "1py0npkf8s46zwbg23cn49f777fc9cid1njg8crc8h71md71j614"; + name = "baloo-5.6.0.tar.xz"; + store = "/nix/store/sgm5dcgmw5cwz60hhhqnlgxq1ck1cffh-baloo-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/plasma-workspace-5.2.0.tar.xz"; + sha256 = "1swii172mv32837kgcxnmafs1blpgpdn6hda07f1aanaz4scxvj3"; + name = "plasma-workspace-5.2.0.tar.xz"; + store = "/nix/store/g2ar4zpsc36zalpd5frzdpxscgzg727b-plasma-workspace-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/kwrited-5.2.0.tar.xz"; + sha256 = "0rg1ml7m6f2kql4qi9pg8dd66hr7rxqgyjg3rs66diibz383cjzb"; + name = "kwrited-5.2.0.tar.xz"; + store = "/nix/store/r5qz9f2s7q0i00lsp86fv1b500cr2x0n-kwrited-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/libmm-qt-5.2.0.tar.xz"; + sha256 = "07flvspy3qs2mhjxnwy3l8giw296p3501ad1hr3bnjidm2iykc6s"; + name = "libmm-qt-5.2.0.tar.xz"; + store = "/nix/store/6fzkxwzqysgwjzmiyg16fdasp64gik52-libmm-qt-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/plasma-nm-5.2.0.tar.xz"; + sha256 = "0br2mqx8g660jcs1hiwssg6fdiddn4zk78kdmcgkpq93y5ysdf5c"; + name = "plasma-nm-5.2.0.tar.xz"; + store = "/nix/store/9n79gfai09ydrjf12ckqviqaf5jkwar8-plasma-nm-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/kwayland-5.2.0.tar.xz"; + sha256 = "1w872ask0w9gbw46dx3si124gmzkapj7naysgrb5zdcdf8avcgqy"; + name = "kwayland-5.2.0.tar.xz"; + store = "/nix/store/jidv4bi8f2iyg3zhdqip5f7lkwmgav94-kwayland-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/ksysguard-5.2.0.tar.xz"; + sha256 = "0kd103kzxgsgrrhfjacy50gg6wsvqa9ix9xk5nb59bbdzj0b4km1"; + name = "ksysguard-5.2.0.tar.xz"; + store = "/nix/store/s4xb576g8hjpl39ysbmzlsw19a99zssy-ksysguard-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/kfilemetadata-5.6.0.tar.xz"; + sha256 = "0vg9lc6d2q6bx53lixcmdhfgwqqr3hfl6g3pvgss237kd3fbb94n"; + name = "kfilemetadata-5.6.0.tar.xz"; + store = "/nix/store/rvjxs89p415z52nhzrmci6s91nb0fy5a-kfilemetadata-5.6.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/bluedevil-5.2.0.tar.xz"; + sha256 = "01a3h0jp9nq9fs1zv4wp7jgmpv4nscflb3nkz93dg0g1bis1kgnh"; + name = "bluedevil-5.2.0.tar.xz"; + store = "/nix/store/w4s1zfgmallmqq400pvh6zy9qrss6206-bluedevil-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/breeze-5.2.0.tar.xz"; + sha256 = "1s8381nhszb2d7b0r6rmngnkgw28xxsfhnginbcb6zkljgprnkkh"; + name = "breeze-5.2.0.tar.xz"; + store = "/nix/store/yyq50zwlb2xxahkb6w0zvz41rz2gg4k1-breeze-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/oxygen-fonts-5.2.0.tar.xz"; + sha256 = "102hycnk4naysmyj87mv1sm41aq214f3wjzzi429r0i135wdblki"; + name = "oxygen-fonts-5.2.0.tar.xz"; + store = "/nix/store/96is0p4rp0nqv9yllqrk9xhv4fa86gan-oxygen-fonts-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/powerdevil-5.2.0.tar.xz"; + sha256 = "1mi60xn4pgwrq4w3i45gxqjqqfwjxzkkyx89fkwwj1xv68bkwshs"; + name = "powerdevil-5.2.0.tar.xz"; + store = "/nix/store/lqny6rqbrgpadkm6d1s52i9959zwhjh8-powerdevil-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/muon-5.2.0.tar.xz"; + sha256 = "15vcrm7y5khpc0rngzqbhizg2w0rz6adf5v3cpwafmqaq3iqlcb7"; + name = "muon-5.2.0.tar.xz"; + store = "/nix/store/f7i8c6ig71506aqcmj3mp8yapyid5zki-muon-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/khotkeys-5.2.0.tar.xz"; + sha256 = "187757g70wjq1v9r7nf3fxc6233sb5m28s4aswlm7rjvys5lmkch"; + name = "khotkeys-5.2.0.tar.xz"; + store = "/nix/store/6sqh6vy8i8xg5xqh0b2ic1a3wb1nv2p8-khotkeys-5.2.0.tar.xz"; + } + { + url = "${mirror}/stable/plasma/5.2.0/kwin-5.2.0.tar.xz"; + sha256 = "0ys76xllgr2034bxpr5m1qm5v8qp8wnzn09f6gghcvnm3lqki79q"; + name = "kwin-5.2.0.tar.xz"; + store = "/nix/store/hrv9ikwphl3mg8sk6i8b9q3wj5ca24ni-kwin-5.2.0.tar.xz"; + } +] diff --git a/pkgs/desktops/plasma-5.2/manifest.sh b/pkgs/desktops/plasma-5.2/manifest.sh new file mode 100755 index 00000000000..6d0b6ef1452 --- /dev/null +++ b/pkgs/desktops/plasma-5.2/manifest.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +if [ $# -eq 0 ]; then + + # The extra slash at the end of the URL is necessary to stop wget + # from recursing over the whole server! (No, it's not a bug.) + $(nix-build ../../.. -A autonix.manifest) \ + http://download.kde.org/stable/plasma/5.2.0/ \ + -A '*.tar.xz' + +else + + $(nix-build ../../.. -A autonix.manifest) -A '*.tar.xz' "$@" + +fi diff --git a/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-hwclock.patch b/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-hwclock.patch new file mode 100644 index 00000000000..53bd43d38e2 --- /dev/null +++ b/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-hwclock.patch @@ -0,0 +1,24 @@ +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"); + } diff --git a/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-zoneinfo.patch b/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-zoneinfo.patch new file mode 100644 index 00000000000..e924207054d --- /dev/null +++ b/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-zoneinfo.patch @@ -0,0 +1,18 @@ +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"); diff --git a/pkgs/desktops/plasma-5.2/renames.nix b/pkgs/desktops/plasma-5.2/renames.nix new file mode 100644 index 00000000000..5778a2bc819 --- /dev/null +++ b/pkgs/desktops/plasma-5.2/renames.nix @@ -0,0 +1,23 @@ +# DO NOT EDIT! This file is generated automatically. +{ }: +{ +"Backend" = "powerdevil"; +"CTest" = "kdeplasma-addons"; +"ECM" = "extra-cmake-modules"; +"KDecoration2" = "kdecoration"; +"KF5Baloo" = "baloo"; +"KF5FileMetaData" = "kfilemetadata"; +"KF5ModemManagerQt" = "libmm-qt"; +"KF5Screen" = "libkscreen"; +"KF5SysGuard" = "libksysguard"; +"KF5Wayland" = "kwayland"; +"KF5XmlRpcClientPrivate" = "plasma-workspace"; +"KHotKeysDBusInterface" = "khotkeys"; +"KRunnerAppDBusInterface" = "plasma-workspace"; +"KSMServerDBusInterface" = "plasma-workspace"; +"KWinDBusInterface" = "kwin"; +"LibKWorkspace" = "plasma-workspace"; +"LibTaskManager" = "plasma-workspace"; +"OxygenFont" = "oxygen-fonts"; +"ScreenSaverDBusInterface" = "plasma-workspace"; +} diff --git a/pkgs/desktops/plasma-5.2/setup-hook.sh b/pkgs/desktops/plasma-5.2/setup-hook.sh new file mode 100644 index 00000000000..a8d9b7e0e36 --- /dev/null +++ b/pkgs/desktops/plasma-5.2/setup-hook.sh @@ -0,0 +1 @@ +addToSearchPath XDG_DATA_DIRS @out@/share diff --git a/pkgs/desktops/plasma-5.2/startkde/default.nix b/pkgs/desktops/plasma-5.2/startkde/default.nix new file mode 100644 index 00000000000..6337769e1aa --- /dev/null +++ b/pkgs/desktops/plasma-5.2/startkde/default.nix @@ -0,0 +1,33 @@ +# We provide our own version of the startkde script in its entirety, rather than +# patching the version provided by kde-workspace, because it requires such +# extensive patching. + +{ stdenv, bash, dbus, gnused, gnugrep, kconfig, kinit, kservice, plasma-desktop +, plasma-workspace, qt5, socat, xorg }: + +let startkde = ./startkde.in; in + +stdenv.mkDerivation { + name = "startkde-0.1"; + phases = "installPhase"; + + inherit bash gnused gnugrep kconfig kinit kservice qt5 socat; + inherit (xorg) mkfontdir xmessage xprop xrdb xset xsetroot; + dbus_tools = dbus.tools; + plasmaWorkspace = plasma-workspace; + plasmaDesktop = plasma-desktop; + startupconfigkeys = ./startupconfigkeys; + kdeglobals = ./kdeglobals; + + installPhase = '' + mkdir -p $out/bin + substituteAll ${startkde} $out/bin/startkde + chmod +x $out/bin/startkde + ''; + + meta = { + description = "Custom startkde script for Nixpkgs"; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + license = with stdenv.lib.licenses; [ gpl2Plus ]; + }; +} diff --git a/pkgs/desktops/plasma-5.2/startkde/kdeglobals b/pkgs/desktops/plasma-5.2/startkde/kdeglobals new file mode 100644 index 00000000000..bfa610712ed --- /dev/null +++ b/pkgs/desktops/plasma-5.2/startkde/kdeglobals @@ -0,0 +1,11 @@ +[General] +XftAntialias=true +XftHintStyle=hintmedium +XftSubPixel=none +desktopFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0 +fixed=Oxygen Mono,9,-1,5,50,0,0,0,0,0 +font=Oxygen-Sans,10,-1,5,50,0,0,0,0,0 +menuFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0 +smallestReadableFont=Oxygen-Sans,8,-1,5,50,0,0,0,0,0 +taskbarFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0 +toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0 \ No newline at end of file diff --git a/pkgs/desktops/plasma-5.2/startkde/startkde.in b/pkgs/desktops/plasma-5.2/startkde/startkde.in new file mode 100644 index 00000000000..ff67ed769e2 --- /dev/null +++ b/pkgs/desktops/plasma-5.2/startkde/startkde.in @@ -0,0 +1,382 @@ +#!@bash@/bin/bash -x +# +# NIXOS KDE STARTUP SCRIPT +# + +# 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 + export KWIN_COMPOSE KDE_FAILSAFE +fi + +# When the X server dies we get a HUP signal from xinit. We must ignore it +# because we still need to do some cleanup. +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 + +# Check if a KDE session already is running and whether it's possible to connect to X +@plasmaWorkspace@/bin/kcheckrunning +kcheckrunning_result=$? +if test $kcheckrunning_result -eq 0 ; then + @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 +fi + +# Boot sequence: +# +# kdeinit is used to fork off processes which improves memory usage +# and startup time. +# +# * kdeinit starts klauncher first. +# * Then kded is started. kded is responsible for keeping the sycoca +# database up to date. When an up to date database is present it goes +# into the background and the startup continues. +# * Then kdeinit starts kcminit. kcminit performs initialisation of +# certain devices according to the user's settings +# +# * 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 + # This is the default + # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html + configDir=${HOME}/.config; +fi + +mkdir -p $configDir + +# This is basically setting defaults so we can use them with kstartupconfig5 +cat @startupconfigkeys@ >$configDir/startupconfigkeys + +# preload the user's locale on first start +plasmalocalerc=$configDir/plasma-localerc +test -f $plasmalocalerc || { +cat >$plasmalocalerc <$kdeglobalsfile + +@plasmaWorkspace@/bin/kstartupconfig5 +returncode=$? +if test $returncode -ne 0; then + @xmessage@/bin/xmessage -geometry 500x100 "kstartupconfig5 exited with $returncode" + exit 1 +fi +[ -r $configDir/startupconfig ] && . $configDir/startupconfig + +XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | tr "\n" ":") +export XCURSOR_PATH + +# XCursor mouse theme needs to be applied here to work even for kded or ksmserver +if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then + + @plasmaDesktop@/bin/kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" + if test $? -eq 10; then + XCURSOR_THEME=default + export XCURSOR_THEME + elif test -n "$kcminputrc_mouse_cursortheme"; then + XCURSOR_THEME="$kcminputrc_mouse_cursortheme" + export XCURSOR_THEME + fi + if test -n "$kcminputrc_mouse_cursorsize"; then + XCURSOR_SIZE="$kcminputrc_mouse_cursorsize" + export XCURSOR_SIZE + fi +fi + +# 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@/bin/xsetroot -cursor_name left_ptr + +dl=$DESKTOP_LOCKED +unset DESKTOP_LOCKED # Don't want it in the environment + +# Make sure that D-Bus is running +# D-Bus autolaunch is broken +if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then + eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session` +fi +if @qt5@/bin/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@/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=`@plasmaWorkspace@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid` + ;; + None) + ;; + *) + ;; + esac +fi + +# Source scripts found in /plasma-workspace/env/*.sh +# (where correspond to the system and user's configuration +# directories, as identified by Qt's qtpaths, e.g. $HOME/.config +# and /etc/xdg/ on Linux) +# +# This is where you can define environment variables that will be available to +# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` +# or eval `gpg-agent --daemon`. +# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script +# +# (see end of this file). +# 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=`@qt5@/bin/qtpaths --paths ConfigLocation | 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 + for file in "$prefix"/env/*.sh; do + test -r "$file" && . "$file" + done +done + +# Set the path for Qt plugins provided by KDE +QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`@qt5@/bin/qtpaths --plugin-dir` +# TODO: Do we really need this? +QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/ +export QT_PLUGIN_PATH + +# Activate the kde font directories. +# +# There are 4 directories that may be used for supplying fonts for KDE. +# +# There are two system directories. These belong to the administrator. +# There are two user directories, where the user may add her own fonts. +# +# The 'override' versions are for fonts that should come first in the list, +# i.e. if you have a font in your 'override' directory, it will be used in +# preference to any other. +# +# The preference order looks like this: +# user override, system override, X, user, system +# +# Where X is the original font database that was set up before this script +# runs. + +usr_odir=$HOME/.fonts/kde-override +usr_fdir=$HOME/.fonts + +if test -n "$KDEDIRS"; then + kdedirs_first=`echo "$KDEDIRS" | @gnused@/bin/sed -e 's/:.*//'` + sys_odir=$kdedirs_first/share/fonts/override + sys_fdir=$kdedirs_first/share/fonts +else + sys_odir=$KDEDIR/share/fonts/override + sys_fdir=$KDEDIR/share/fonts +fi + +# We run mkfontdir on the user's font dirs (if we have permission) to pick +# up any new fonts they may have installed. If mkfontdir fails, we still +# 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@/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@/bin/xset fp rehash + +# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap +if test -n "$GS_LIB" ; then + GS_LIB=$usr_fdir:$GS_LIB + export GS_LIB +else + GS_LIB=$usr_fdir + export GS_LIB +fi + +echo 'startkde: Starting up...' 1>&2 + + +# 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 +# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION +# however guarantees that the application is launched in the same environment +# like the KDE session and that e.g. KDE utilities/libraries are available. +# KDE_FULL_SESSION property is also only available since KDE 3.5.5. +# The matching tests are: +# For $KDE_FULL_SESSION: +# if test -n "$KDE_FULL_SESSION"; then ... whatever +# For KDE_FULL_SESSION property: +# xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null +# if test $? -eq 0; then ... whatever +# +# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid +# of the user running the KDE session. It should be rarely needed (e.g. +# after sudo to prevent desktop-wide functionality in the new user's kded). +# +# Since KDE4 there is also KDE_SESSION_VERSION, containing the major version number. +# Note that this didn't exist in KDE3, which can be detected by its absense and +# the presence of KDE_FULL_SESSION. +# +KDE_FULL_SESSION=true +export KDE_FULL_SESSION +@xprop@/bin/xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true + +KDE_SESSION_VERSION=5 +export KDE_SESSION_VERSION +@xprop@/bin/xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 + +KDE_SESSION_UID=`id -ru` +export KDE_SESSION_UID + +XDG_CURRENT_DESKTOP=KDE +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@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN +fi + +# At this point all environment variables are set, let's send it to the DBus +# session server to update the activation environment +@plasmaWorkspace@/lib/libexec/ksyncdbusenv +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@/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 @kinit@/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup +if test $? -ne 0; then + # Startup error + echo 'startkde: Could not start kdeinit5.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null + @xmessage@/bin/xmessage -geometry 500x100 "Could not start kdeinit5." + 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 +# window manager instead of kwin. +# if KDEWM is not set, ksmserver will ensure kwin is started. +# kwrapper5 is used to reduce startup time and memory usage +# kwrapper5 does not return useful error codes such as the exit code of ksmserver. +# We only check for 255 which means that the ksmserver process could not be +# started, any problems thereafter, e.g. ksmserver failing to initialize, +# will remain undetected. +test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" +# If the session should be locked from the start (locked autologin), +# lock now and do the rest of the KDE startup underneath the locker. +KSMSERVEROPTIONS="" +test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" +@kinit@/bin/kwrapper5 @plasmaWorkspace@/bin/ksmserver $KDEWM $KSMSERVEROPTIONS +if test $? -eq 255; then + # Startup error + echo 'startkde: Could not start ksmserver.' 1>&2 + test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null + @xmessage@/bin/xmessage -geometry 500x100 "Could not start ksmserver." +fi + +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=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` + wait_drkonqi_counter=0 + while @qt5@/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 + @qt5@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do + @qt5@/bin/qdbus "$address" "/MainApplication" "quit" + done + break + fi + done +fi + +echo 'startkde: Shutting down...' 1>&2 +# just in case +test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null + +# Clean up +@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 | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do + test -x "$prefix$file" && "$prefix$file" + done +done + +unset KDE_FULL_SESSION +@xprop@/bin/xprop -root -remove KDE_FULL_SESSION +unset KDE_SESSION_VERSION +@xprop@/bin/xprop -root -remove KDE_SESSION_VERSION +unset KDE_SESSION_UID + +echo 'startkde: Done.' 1>&2 diff --git a/pkgs/desktops/plasma-5.2/startkde/startupconfigkeys b/pkgs/desktops/plasma-5.2/startkde/startupconfigkeys new file mode 100644 index 00000000000..0fc92cff8a5 --- /dev/null +++ b/pkgs/desktops/plasma-5.2/startkde/startupconfigkeys @@ -0,0 +1,5 @@ +kcminputrc Mouse cursorTheme 'breeze_cursors' +kcminputrc Mouse cursorSize '' +ksplashrc KSplash Theme Breeze +ksplashrc KSplash Engine KSplashQML +kcmfonts General forceFontDPI 0 diff --git a/pkgs/development/libraries/kde-frameworks-5.6/default.nix b/pkgs/development/libraries/kde-frameworks-5.6/default.nix index 2a2dc9fa938..237dbdcc713 100644 --- a/pkgs/development/libraries/kde-frameworks-5.6/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.6/default.nix @@ -65,7 +65,7 @@ let (with pkgs; { inherit cmake; - Boost = boost; + Boost = boost155; GIF = giflib; GLIB2 = glib; Gpgme = gpgme; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f2c372446f..30203314486 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5883,6 +5883,7 @@ let libavc1394 = callPackage ../development/libraries/libavc1394 { }; libbluedevil = callPackage ../development/libraries/libbluedevil { }; + libbluedevil-qt5 = callPackage ../development/libraries/libbluedevil/qt5.nix { }; libbluray = callPackage ../development/libraries/libbluray { }; @@ -12461,7 +12462,10 @@ let plasma51 = recurseIntoAttrs (callPackage ../desktops/plasma-5.1 { stdenv = overrideGCC stdenv gccStdInc; }); - plasma5_latest = plasma51; + plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 { + stdenv = overrideGCC stdenv gccStdInc; + }); + plasma5_latest = plasma52; plasma5_stable = plasma51; kde5 = kf55 // plasma51 // kdeApps_14_12; From 41d579747859f9a97ce453c71564236e98bc983e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 28 Jan 2015 08:39:42 -0600 Subject: [PATCH 3/4] kf56.kpackage: patch to allow external paths --- .../libraries/kde-frameworks-5.6/default.nix | 2 ++ .../kpackage/0001-allow-external-paths.patch | 25 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/kde-frameworks-5.6/kpackage/0001-allow-external-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.6/default.nix b/pkgs/development/libraries/kde-frameworks-5.6/default.nix index 237dbdcc713..a6f3d4ea389 100644 --- a/pkgs/development/libraries/kde-frameworks-5.6/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.6/default.nix @@ -163,6 +163,8 @@ let kinit = super.kinit // { patches = [ ./kinit/kinit-libpath.patch ]; }; + kpackage = super.kpackage // { patches = [ ./kpackage/0001-allow-external-paths.patch ]; }; + kservice = super.kservice // { buildInputs = super.kservice.buildInputs ++ [kf5.kwindowsystem]; patches = diff --git a/pkgs/development/libraries/kde-frameworks-5.6/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.6/kpackage/0001-allow-external-paths.patch new file mode 100644 index 00000000000..440e979c008 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.6/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 + From aa308252ac8ff9f2cfde1038b10f9287c1b1b9fc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 28 Jan 2015 08:40:27 -0600 Subject: [PATCH 4/4] kf56, plasma52: use ordinary stdenv --- pkgs/desktops/plasma-5.2/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 8 ++------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/plasma-5.2/default.nix b/pkgs/desktops/plasma-5.2/default.nix index 28bdc26bd4e..4646fda268d 100644 --- a/pkgs/desktops/plasma-5.2/default.nix +++ b/pkgs/desktops/plasma-5.2/default.nix @@ -127,10 +127,6 @@ let substituteInPlace kcms/dateandtime/helper.cpp \ --subst-var-by hwclock "${utillinux}/sbin/hwclock" ''; - enableParallelBuilding = false; - NIX_CFLAGS_COMPILE = - (super.plasma-desktop.NIX_CFLAGS_COMPILE or "") - + " -Wno-error=return-type"; }; plasma-workspace = with pkgs; super.plasma-workspace // { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30203314486..de880448481 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5814,9 +5814,7 @@ let kf55 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.5 { stdenv = overrideGCC stdenv gccStdInc; }); - kf56 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.6 { - stdenv = overrideGCC stdenv gccStdInc; - }); + kf56 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.6 {}); kf5_latest = kf56; kf5_stable = kf55; @@ -12462,9 +12460,7 @@ let plasma51 = recurseIntoAttrs (callPackage ../desktops/plasma-5.1 { stdenv = overrideGCC stdenv gccStdInc; }); - plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 { - stdenv = overrideGCC stdenv gccStdInc; - }); + plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {}); plasma5_latest = plasma52; plasma5_stable = plasma51;