remove kf516
This commit is contained in:
Thomas Tuegel
parent
54829da822
commit
28b74a05af
@ -49,6 +49,6 @@ let
|
||||
l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
|
||||
};
|
||||
|
||||
newScope = scope: pkgs.kf516.newScope ({ inherit kdeApp; } // scope);
|
||||
newScope = scope: pkgs.kf517.newScope ({ inherit kdeApp; } // scope);
|
||||
|
||||
in lib.makeScope newScope packages
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "attica";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig
|
||||
, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
|
||||
, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "baloo";
|
||||
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
|
||||
buildInputs = [
|
||||
kconfig kcrash kdbusaddons lmdb qtquick1 solid
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase
|
||||
];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/baloo_file"
|
||||
wrapQtProgram "$out/bin/baloo_file_extractor"
|
||||
wrapQtProgram "$out/bin/balooctl"
|
||||
wrapQtProgram "$out/bin/baloosearch"
|
||||
wrapQtProgram "$out/bin/balooshow"
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, qtdeclarative
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "bluez-qt";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ qtdeclarative ];
|
||||
preConfigure = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace /lib/udev/rules.d "$out/lib/udev/rules.d"
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
{ kdeFramework
|
||||
, extra-cmake-modules
|
||||
, qtsvg
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "breeze-icons";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
propagatedUserEnvPkgs = [ qtsvg ];
|
||||
}
|
||||
@ -1,114 +0,0 @@
|
||||
# Maintainer's Notes:
|
||||
#
|
||||
# How To Update
|
||||
# 1. Edit the URL in ./manifest.sh
|
||||
# 2. Run ./manifest.sh
|
||||
# 3. Fix build errors.
|
||||
|
||||
{ pkgs, debug ? false }:
|
||||
|
||||
let
|
||||
|
||||
inherit (pkgs) lib makeSetupHook stdenv;
|
||||
|
||||
mirror = "mirror://kde";
|
||||
srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
|
||||
|
||||
kdeFramework = args:
|
||||
let
|
||||
inherit (args) name;
|
||||
inherit (srcs."${name}") src version;
|
||||
in stdenv.mkDerivation (args // {
|
||||
name = "${name}-${version}";
|
||||
inherit src;
|
||||
|
||||
cmakeFlags =
|
||||
(args.cmakeFlags or [])
|
||||
++ [ "-DBUILD_TESTING=OFF" ]
|
||||
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
|
||||
|
||||
meta = {
|
||||
license = with lib.licenses; [
|
||||
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
homepage = "http://www.kde.org";
|
||||
} // (args.meta or {});
|
||||
});
|
||||
|
||||
addPackages = self: with self; {
|
||||
attica = callPackage ./attica.nix {};
|
||||
baloo = callPackage ./baloo.nix {};
|
||||
bluez-qt = callPackage ./bluez-qt.nix {};
|
||||
breeze-icons = callPackage ./breeze-icons.nix {};
|
||||
extra-cmake-modules = callPackage ./extra-cmake-modules {};
|
||||
frameworkintegration = callPackage ./frameworkintegration.nix {};
|
||||
kactivities = callPackage ./kactivities.nix {};
|
||||
kapidox = callPackage ./kapidox.nix {};
|
||||
karchive = callPackage ./karchive.nix {};
|
||||
kauth = callPackage ./kauth {};
|
||||
kbookmarks = callPackage ./kbookmarks.nix {};
|
||||
kcmutils = callPackage ./kcmutils {};
|
||||
kcodecs = callPackage ./kcodecs.nix {};
|
||||
kcompletion = callPackage ./kcompletion.nix {};
|
||||
kconfig = callPackage ./kconfig.nix {};
|
||||
kconfigwidgets = callPackage ./kconfigwidgets {};
|
||||
kcoreaddons = callPackage ./kcoreaddons.nix {};
|
||||
kcrash = callPackage ./kcrash.nix {};
|
||||
kdbusaddons = callPackage ./kdbusaddons.nix {};
|
||||
kdeclarative = callPackage ./kdeclarative.nix {};
|
||||
kded = callPackage ./kded.nix {};
|
||||
kdelibs4support = callPackage ./kdelibs4support.nix {};
|
||||
kdesignerplugin = callPackage ./kdesignerplugin.nix {};
|
||||
kdewebkit = callPackage ./kdewebkit.nix {};
|
||||
kdesu = callPackage ./kdesu.nix {};
|
||||
kdnssd = callPackage ./kdnssd.nix {};
|
||||
kdoctools = callPackage ./kdoctools {};
|
||||
kemoticons = callPackage ./kemoticons.nix {};
|
||||
kfilemetadata = callPackage ./kfilemetadata.nix {};
|
||||
kglobalaccel = callPackage ./kglobalaccel.nix {};
|
||||
kguiaddons = callPackage ./kguiaddons.nix {};
|
||||
khtml = callPackage ./khtml.nix {};
|
||||
ki18n = callPackage ./ki18n.nix {};
|
||||
kiconthemes = callPackage ./kiconthemes.nix {};
|
||||
kidletime = callPackage ./kidletime.nix {};
|
||||
kimageformats = callPackage ./kimageformats.nix {};
|
||||
kinit = callPackage ./kinit {};
|
||||
kio = callPackage ./kio.nix {};
|
||||
kitemmodels = callPackage ./kitemmodels.nix {};
|
||||
kitemviews = callPackage ./kitemviews.nix {};
|
||||
kjobwidgets = callPackage ./kjobwidgets.nix {};
|
||||
kjs = callPackage ./kjs.nix {};
|
||||
kjsembed = callPackage ./kjsembed.nix {};
|
||||
kmediaplayer = callPackage ./kmediaplayer.nix {};
|
||||
knewstuff = callPackage ./knewstuff.nix {};
|
||||
knotifications = callPackage ./knotifications.nix {};
|
||||
knotifyconfig = callPackage ./knotifyconfig.nix {};
|
||||
kpackage = callPackage ./kpackage {};
|
||||
kparts = callPackage ./kparts.nix {};
|
||||
kpeople = callPackage ./kpeople.nix {};
|
||||
kplotting = callPackage ./kplotting.nix {};
|
||||
kpty = callPackage ./kpty.nix {};
|
||||
kross = callPackage ./kross.nix {};
|
||||
krunner = callPackage ./krunner.nix {};
|
||||
kservice = callPackage ./kservice {};
|
||||
ktexteditor = callPackage ./ktexteditor {};
|
||||
ktextwidgets = callPackage ./ktextwidgets.nix {};
|
||||
kunitconversion = callPackage ./kunitconversion.nix {};
|
||||
kwallet = callPackage ./kwallet.nix {};
|
||||
kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
|
||||
kwindowsystem = callPackage ./kwindowsystem.nix {};
|
||||
kxmlgui = callPackage ./kxmlgui.nix {};
|
||||
kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
|
||||
modemmanager-qt = callPackage ./modemmanager-qt.nix {};
|
||||
networkmanager-qt = callPackage ./networkmanager-qt.nix {};
|
||||
oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
|
||||
plasma-framework = callPackage ./plasma-framework {};
|
||||
solid = callPackage ./solid.nix {};
|
||||
sonnet = callPackage ./sonnet.nix {};
|
||||
threadweaver = callPackage ./threadweaver.nix {};
|
||||
};
|
||||
|
||||
newScope = scope: pkgs.qt55Libs.newScope ({ inherit kdeFramework; } // scope);
|
||||
|
||||
in lib.makeScope newScope addPackages
|
||||
@ -1,74 +0,0 @@
|
||||
From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Fri, 20 Feb 2015 23:17:39 -0600
|
||||
Subject: [PATCH] extra-cmake-modules paths
|
||||
|
||||
---
|
||||
kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
|
||||
1 file changed, 4 insertions(+), 33 deletions(-)
|
||||
|
||||
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
|
||||
index b7cd34d..2f868ac 100644
|
||||
--- a/kde-modules/KDEInstallDirs.cmake
|
||||
+++ b/kde-modules/KDEInstallDirs.cmake
|
||||
@@ -193,37 +193,8 @@
|
||||
# (To distribute this file outside of extra-cmake-modules, substitute the full
|
||||
# License text for the above reference.)
|
||||
|
||||
-# Figure out what the default install directory for libraries should be.
|
||||
-# This is based on the logic in GNUInstallDirs, but simplified (the
|
||||
-# GNUInstallDirs code deals with re-configuring, but that is dealt with
|
||||
-# by the _define_* macros in this module).
|
||||
+# The default library directory on NixOS is *always* /lib.
|
||||
set(_LIBDIR_DEFAULT "lib")
|
||||
-# Override this default 'lib' with 'lib64' iff:
|
||||
-# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
|
||||
-# - we are NOT on debian
|
||||
-# - we are on a 64 bits system
|
||||
-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
|
||||
-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
|
||||
-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
|
||||
-# See http://wiki.debian.org/Multiarch
|
||||
-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
|
||||
- AND NOT CMAKE_CROSSCOMPILING)
|
||||
- if (EXISTS "/etc/debian_version") # is this a debian system ?
|
||||
- if(CMAKE_LIBRARY_ARCHITECTURE)
|
||||
- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
|
||||
- endif()
|
||||
- else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
|
||||
- if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
|
||||
- message(AUTHOR_WARNING
|
||||
- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
|
||||
- "Please enable at least one language before including KDEInstallDirs.")
|
||||
- else()
|
||||
- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
|
||||
- set(_LIBDIR_DEFAULT "lib64")
|
||||
- endif()
|
||||
- endif()
|
||||
- endif()
|
||||
-endif()
|
||||
|
||||
set(_gnu_install_dirs_vars
|
||||
BINDIR
|
||||
@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
|
||||
"QtQuick2 imports"
|
||||
QML_INSTALL_DIR)
|
||||
else()
|
||||
- _define_relative(QTPLUGINDIR LIBDIR "plugins"
|
||||
+ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
|
||||
"Qt plugins"
|
||||
QT_PLUGIN_INSTALL_DIR)
|
||||
|
||||
- _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
|
||||
+ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
|
||||
"QtQuick1 imports"
|
||||
IMPORTS_INSTALL_DIR)
|
||||
|
||||
- _define_relative(QMLDIR LIBDIR "qml"
|
||||
+ _define_relative(QMLDIR LIBDIR "qt5/qml"
|
||||
"QtQuick2 imports"
|
||||
QML_INSTALL_DIR)
|
||||
endif()
|
||||
--
|
||||
2.3.0
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }:
|
||||
|
||||
kdeFramework {
|
||||
name = "extra-cmake-modules";
|
||||
patches = [ ./0001-extra-cmake-modules-paths.patch ];
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
# It is OK to propagate these inputs as long as
|
||||
# extra-cmake-modules is never a propagated input
|
||||
# of some other derivation.
|
||||
propagatedNativeBuildInputs = [ cmake pkgconfig qttools ];
|
||||
|
||||
meta = {
|
||||
license = stdenv.lib.licenses.bsd2;
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,27 +0,0 @@
|
||||
addMimePkg() {
|
||||
local propagated
|
||||
|
||||
if [[ -d "$1/share/mime" ]]; then
|
||||
propagated=
|
||||
for pkg in $propagatedBuildInputs; do
|
||||
if [[ "z$pkg" == "z$1" ]]; then
|
||||
propagated=1
|
||||
fi
|
||||
done
|
||||
if [[ -z $propagated ]]; then
|
||||
propagatedBuildInputs="$propagatedBuildInputs $1"
|
||||
fi
|
||||
|
||||
propagated=
|
||||
for pkg in $propagatedUserEnvPkgs; do
|
||||
if [[ "z$pkg" == "z$1" ]]; then
|
||||
propagated=1
|
||||
fi
|
||||
done
|
||||
if [[ -z $propagated ]]; then
|
||||
propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
envHooks+=(addMimePkg)
|
||||
@ -1,57 +0,0 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p coreutils findutils gnused nix wget
|
||||
|
||||
set -x
|
||||
|
||||
# The trailing slash at the end is necessary!
|
||||
RELEASE_URL="http://download.kde.org/stable/frameworks/5.16/"
|
||||
EXTRA_WGET_ARGS='-A *.tar.xz'
|
||||
|
||||
mkdir tmp; cd tmp
|
||||
|
||||
rm -f ../srcs.csv
|
||||
|
||||
wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
|
||||
|
||||
find . | while read src; do
|
||||
if [[ -f "${src}" ]]; then
|
||||
# Sanitize file name
|
||||
filename=$(basename "$src" | tr '@' '_')
|
||||
nameVersion="${filename%.tar.*}"
|
||||
name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
|
||||
version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
|
||||
echo "$name,$version,$src,$filename" >>../srcs.csv
|
||||
fi
|
||||
done
|
||||
|
||||
cat >../srcs.nix <<EOF
|
||||
# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
|
||||
{ fetchurl, mirror }:
|
||||
|
||||
{
|
||||
EOF
|
||||
|
||||
gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do
|
||||
versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv)
|
||||
latestVersion=$(echo "$versions" | sort -rV | head -n 1)
|
||||
src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv)
|
||||
filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv)
|
||||
url="${src:2}"
|
||||
sha256=$(nix-hash --type sha256 --base32 --flat "$src")
|
||||
cat >>../srcs.nix <<EOF
|
||||
$name = {
|
||||
version = "$latestVersion";
|
||||
src = fetchurl {
|
||||
url = "\${mirror}/$url";
|
||||
sha256 = "$sha256";
|
||||
name = "$filename";
|
||||
};
|
||||
};
|
||||
EOF
|
||||
done
|
||||
|
||||
echo "}" >>../srcs.nix
|
||||
|
||||
rm -f ../srcs.csv
|
||||
|
||||
cd ..
|
||||
@ -1,17 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion
|
||||
, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications
|
||||
, kwidgetsaddons, libXcursor, qtx11extras
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "frameworkintegration";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [
|
||||
kbookmarks kcompletion kconfig knotifications kwidgetsaddons
|
||||
libXcursor
|
||||
];
|
||||
propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
|
||||
, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
|
||||
, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kactivities";
|
||||
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
|
||||
buildInputs = [
|
||||
boost kcmutils kconfig kcoreaddons kdbusaddons kservice
|
||||
kxmlgui
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative
|
||||
];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/kactivitymanagerd"
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, python
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kapidox";
|
||||
nativeBuildInputs = [ extra-cmake-modules python ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "karchive";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, kcoreaddons
|
||||
, polkitQt
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kauth";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ polkitQt ];
|
||||
propagatedBuildInputs = [ kcoreaddons ];
|
||||
patches = [ ./kauth-policy-install.patch ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
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@")
|
||||
@ -1,25 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, kcodecs
|
||||
, kconfig
|
||||
, kconfigwidgets
|
||||
, kcoreaddons
|
||||
, kiconthemes
|
||||
, kxmlgui
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kbookmarks";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [
|
||||
kcodecs
|
||||
kconfig
|
||||
kconfigwidgets
|
||||
kcoreaddons
|
||||
kiconthemes
|
||||
kxmlgui
|
||||
];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Wed, 14 Oct 2015 06:43:53 -0500
|
||||
Subject: [PATCH] qdiriterator follow symlinks
|
||||
|
||||
---
|
||||
src/kpluginselector.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
|
||||
index 9c3431d..d6b1ee2 100644
|
||||
--- a/src/kpluginselector.cpp
|
||||
+++ b/src/kpluginselector.cpp
|
||||
@@ -305,7 +305,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());
|
||||
}
|
||||
--
|
||||
2.5.2
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets
|
||||
, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews
|
||||
, kpackage, kservice, kxmlgui
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kcmutils";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [
|
||||
kcoreaddons kiconthemes kitemviews kpackage kxmlgui
|
||||
];
|
||||
propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ];
|
||||
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kcodecs";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, kconfig
|
||||
, kwidgetsaddons
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kcompletion";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ kconfig kwidgetsaddons ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, makeQtWrapper
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kconfig";
|
||||
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/kreadconfig5"
|
||||
wrapQtProgram "$out/bin/kwriteconfig5"
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Wed, 14 Oct 2015 06:47:01 -0500
|
||||
Subject: [PATCH] qdiriterator follow symlinks
|
||||
|
||||
---
|
||||
src/khelpclient.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
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);
|
||||
--
|
||||
2.5.2
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig
|
||||
, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kconfigwidgets";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
|
||||
buildInputs = [ kguiaddons ];
|
||||
propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ];
|
||||
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/preparetips5"
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
{ kdeFramework, lib, makeQtWrapper
|
||||
, extra-cmake-modules
|
||||
, shared_mime_info
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kcoreaddons";
|
||||
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
|
||||
buildInputs = [ shared_mime_info ];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/desktoptojson"
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, kcoreaddons
|
||||
, kwindowsystem
|
||||
, qtx11extras
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kcrash";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ kcoreaddons ];
|
||||
propagatedBuildInputs = [ kwindowsystem qtx11extras ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, makeQtWrapper
|
||||
, qtx11extras
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kdbusaddons";
|
||||
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
|
||||
propagatedBuildInputs = [ qtx11extras ];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/kquitapp5"
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig
|
||||
, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage
|
||||
, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig
|
||||
, qtdeclarative
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kdeclarative";
|
||||
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
|
||||
buildInputs = [
|
||||
epoxy kguiaddons kiconthemes kwidgetsaddons
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative
|
||||
];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/kpackagelauncherqml"
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, kconfig
|
||||
, kcoreaddons
|
||||
, kcrash
|
||||
, kdbusaddons
|
||||
, kdoctools
|
||||
, kinit
|
||||
, kservice
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kded";
|
||||
buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ];
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,32 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth
|
||||
, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
|
||||
, kcrash, kdbusaddons, kdesignerplugin, kdoctools, kemoticons
|
||||
, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
|
||||
, kinit, knotifications, kparts, kservice, ktextwidgets
|
||||
, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
|
||||
, networkmanager, qtsvg, qtx11extras, xlibs
|
||||
}:
|
||||
|
||||
# TODO: debug docbook detection
|
||||
|
||||
kdeFramework {
|
||||
name = "kdelibs4support";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
kcompletion kconfig kservice kwidgetsaddons
|
||||
kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
|
||||
kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio
|
||||
kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
|
||||
kunitconversion kwindowsystem
|
||||
];
|
||||
cmakeFlags = [
|
||||
"-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
|
||||
"-DDocBookXML4_DTD_VERSION=4.5"
|
||||
];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
{ kdeFramework, lib, makeQtWrapper
|
||||
, extra-cmake-modules
|
||||
, kcompletion
|
||||
, kconfig
|
||||
, kconfigwidgets
|
||||
, kcoreaddons
|
||||
, kdewebkit
|
||||
, kdoctools
|
||||
, kiconthemes
|
||||
, kio
|
||||
, kitemviews
|
||||
, kplotting
|
||||
, ktextwidgets
|
||||
, kwidgetsaddons
|
||||
, kxmlgui
|
||||
, sonnet
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kdesignerplugin";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
|
||||
buildInputs = [
|
||||
kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit
|
||||
kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons
|
||||
kxmlgui
|
||||
];
|
||||
propagatedBuildInputs = [ kio sonnet ];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/kgendesignerplugin"
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
|
||||
, kservice
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kdesu";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ kcoreaddons kservice ];
|
||||
propagatedBuildInputs = [ ki18n kpty ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
|
||||
, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kdewebkit";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ];
|
||||
propagatedBuildInputs = [ ki18n kio qtwebkit ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, avahi
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kdnssd";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ avahi ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45
|
||||
, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kdoctools";
|
||||
setupHook = ./setup-hook.sh;
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ karchive ];
|
||||
propagatedBuildInputs = [ ki18n ];
|
||||
propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ];
|
||||
cmakeFlags = [
|
||||
"-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
|
||||
"-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
|
||||
];
|
||||
patches = [ ./kdoctools-no-find-docbook-xml.patch ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
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
|
||||
@ -1,5 +0,0 @@
|
||||
addXdgData() {
|
||||
addToSearchPath XDG_DATA_DIRS "$1/share"
|
||||
}
|
||||
|
||||
envHooks+=(addXdgData)
|
||||
@ -1,17 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, karchive
|
||||
, kconfig
|
||||
, kcoreaddons
|
||||
, kservice
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kemoticons";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ karchive kconfig kcoreaddons ];
|
||||
propagatedBuildInputs = [ kservice ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2
|
||||
, ffmpeg, karchive, ki18n, popplerQt, qtbase, taglib
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kfilemetadata";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive popplerQt taglib ];
|
||||
propagatedBuildInputs = [ qtbase ki18n ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, kconfig
|
||||
, kcoreaddons
|
||||
, kcrash
|
||||
, kdbusaddons
|
||||
, kwindowsystem
|
||||
, makeQtWrapper
|
||||
, qtx11extras
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kglobalaccel";
|
||||
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
|
||||
buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ];
|
||||
propagatedBuildInputs = [ kwindowsystem qtx11extras ];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/kglobalaccel5"
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, qtx11extras
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kguiaddons";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ qtx11extras ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,21 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, giflib, karchive
|
||||
, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs
|
||||
, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons
|
||||
, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "khtml";
|
||||
nativeBuildInputs = [ extra-cmake-modules perl ];
|
||||
buildInputs = [
|
||||
giflib karchive kiconthemes knotifications kwallet kwidgetsaddons
|
||||
kxmlgui phonon
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets
|
||||
kwindowsystem qtx11extras sonnet
|
||||
];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, gettext
|
||||
, python
|
||||
, qtscript
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "ki18n";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ qtscript ];
|
||||
propagatedNativeBuildInputs = [ gettext python ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
{ kdeFramework, lib, makeQtWrapper
|
||||
, extra-cmake-modules, kconfigwidgets, ki18n
|
||||
, kitemviews, qtsvg
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kiconthemes";
|
||||
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
|
||||
buildInputs = [ kconfigwidgets kitemviews qtsvg ];
|
||||
propagatedBuildInputs = [ ki18n ];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/kiconfinder5"
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, qtbase
|
||||
, qtx11extras
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kidletime";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ qtx11extras ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, ilmbase
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kimageformats";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Sat, 13 Jun 2015 08:57:55 -0500
|
||||
Subject: [PATCH] kinit libpath
|
||||
|
||||
---
|
||||
src/kdeinit/kinit.cpp | 18 ++++++++++--------
|
||||
1 file changed, 10 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
|
||||
index 9e775b6..0ac5646 100644
|
||||
--- a/src/kdeinit/kinit.cpp
|
||||
+++ b/src/kdeinit/kinit.cpp
|
||||
@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
|
||||
if (!libpath.isEmpty()) {
|
||||
if (!l.load()) {
|
||||
if (libpath_relative) {
|
||||
- // NB: Because Qt makes the actual dlopen() call, the
|
||||
- // RUNPATH of kdeinit is *not* respected - see
|
||||
- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945
|
||||
- // - so we try hacking it in ourselves
|
||||
- QString install_lib_dir = QFile::decodeName(
|
||||
- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
|
||||
- libpath = install_lib_dir + libpath;
|
||||
- l.setFileName(libpath);
|
||||
+ // Use QT_PLUGIN_PATH to find shared library directories
|
||||
+ // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5
|
||||
+ // shared libraries should be in /lib/qt5/plugins/../../
|
||||
+ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
|
||||
+ const QString up = QString::fromLocal8Bit("/../../");
|
||||
+ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
|
||||
+ Q_FOREACH (const QString &path, paths) {
|
||||
+ l.setFileName(path + up + libpath);
|
||||
l.load();
|
||||
+ if (l.isLoaded()) break;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
if (!l.isLoaded()) {
|
||||
--
|
||||
2.4.2
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, kconfig, kcrash
|
||||
, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap
|
||||
, libcap_progs
|
||||
}:
|
||||
|
||||
# TODO: setuid wrapper
|
||||
|
||||
kdeFramework {
|
||||
name = "kinit";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ];
|
||||
buildInputs = [ kconfig kcrash kservice libcap ];
|
||||
propagatedBuildInputs = [ ki18n kio kwindowsystem ];
|
||||
patches = [ ./0001-kinit-libpath.patch ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,31 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, acl, karchive
|
||||
, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
|
||||
, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
|
||||
, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
|
||||
, kwidgetsaddons, kwindowsystem, kxmlgui, makeQtWrapper
|
||||
, qtscript, qtx11extras, solid
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kio";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
|
||||
buildInputs = [
|
||||
acl karchive kconfig kcoreaddons kdbusaddons kiconthemes
|
||||
knotifications ktextwidgets kwallet kwidgetsaddons
|
||||
qtscript
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets
|
||||
kservice kwindowsystem kxmlgui solid qtx11extras
|
||||
];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/kcookiejar5"
|
||||
wrapQtProgram "$out/bin/ktelnetservice5"
|
||||
wrapQtProgram "$out/bin/ktrash5"
|
||||
wrapQtProgram "$out/bin/kmailservice5"
|
||||
wrapQtProgram "$out/bin/protocoltojson"
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kitemmodels";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kitemviews";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, kcoreaddons
|
||||
, kwidgetsaddons
|
||||
, qtx11extras
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kjobwidgets";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ kcoreaddons kwidgetsaddons ];
|
||||
propagatedBuildInputs = [ qtx11extras ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, kdoctools
|
||||
, makeQtWrapper
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kjs";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/kjs5"
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs
|
||||
, makeQtWrapper, qtsvg
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kjsembed";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
|
||||
buildInputs = [ qtsvg ];
|
||||
propagatedBuildInputs = [ ki18n kjs ];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/kjscmd5"
|
||||
wrapQtProgram "$out/bin/kjsconsole"
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, kparts
|
||||
, kxmlgui
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kmediaplayer";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ kxmlgui ];
|
||||
propagatedBuildInputs = [ kparts ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, attica, karchive
|
||||
, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio
|
||||
, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "knewstuff";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [
|
||||
karchive kcompletion kconfig kcoreaddons kiconthemes
|
||||
kitemviews ktextwidgets kwidgetsaddons
|
||||
];
|
||||
propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,21 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, kcodecs
|
||||
, kconfig
|
||||
, kcoreaddons
|
||||
, kwindowsystem
|
||||
, phonon
|
||||
, qtx11extras
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "knotifications";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [
|
||||
kcodecs kconfig kcoreaddons phonon
|
||||
];
|
||||
propagatedBuildInputs = [ kwindowsystem qtx11extras ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
|
||||
, ki18n, kio, phonon
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "knotifyconfig";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ kcompletion kconfig phonon ];
|
||||
propagatedBuildInputs = [ ki18n kio ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
From a92ac391b4e6ca335bd7fa78f1addd23c9467931 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Wed, 28 Jan 2015 07:15:30 -0600
|
||||
Subject: [PATCH 1/2] 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 539b21a..977a026 100644
|
||||
--- a/src/kpackage/package.cpp
|
||||
+++ b/src/kpackage/package.cpp
|
||||
@@ -789,7 +789,7 @@ PackagePrivate::PackagePrivate()
|
||||
: QSharedData(),
|
||||
fallbackPackage(0),
|
||||
metadata(0),
|
||||
- externalPaths(false),
|
||||
+ externalPaths(true),
|
||||
valid(false),
|
||||
checkedValid(false)
|
||||
{
|
||||
--
|
||||
2.5.2
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From 9fc26c3c0478eb7cb0a531836ba2e3a85d820c88 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Wed, 14 Oct 2015 06:50:28 -0500
|
||||
Subject: [PATCH 2/2] qdiriterator follow symlinks
|
||||
|
||||
---
|
||||
src/kpackage/packageloader.cpp | 2 +-
|
||||
src/kpackage/private/packagejobthread.cpp | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp
|
||||
index eb5ed47..94217f6 100644
|
||||
--- a/src/kpackage/packageloader.cpp
|
||||
+++ b/src/kpackage/packageloader.cpp
|
||||
@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat,
|
||||
} else {
|
||||
//qDebug() << "Not cached";
|
||||
// If there's no cache file, fall back to listing the directory
|
||||
- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
|
||||
+ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
|
||||
const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop"));
|
||||
|
||||
QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
|
||||
diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp
|
||||
index ca523b3..1cfa792 100644
|
||||
--- a/src/kpackage/private/packagejobthread.cpp
|
||||
+++ b/src/kpackage/private/packagejobthread.cpp
|
||||
@@ -145,7 +145,7 @@ bool indexDirectory(const QString& dir, const QString& dest)
|
||||
QJsonArray plugins;
|
||||
|
||||
int i = 0;
|
||||
- QDirIterator it(dir, QStringList()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories);
|
||||
+ QDirIterator it(dir, QStringList()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
|
||||
while (it.hasNext()) {
|
||||
it.next();
|
||||
const QString path = it.fileInfo().absoluteFilePath();
|
||||
--
|
||||
2.5.2
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, karchive
|
||||
, kconfig
|
||||
, kcoreaddons
|
||||
, kdoctools
|
||||
, ki18n
|
||||
, makeQtWrapper
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kpackage";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
|
||||
buildInputs = [ karchive kconfig ];
|
||||
propagatedBuildInputs = [ kcoreaddons ki18n ];
|
||||
patches = [
|
||||
./0001-allow-external-paths.patch
|
||||
./0002-qdiriterator-follow-symlinks.patch
|
||||
];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/kpackagetool5"
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
|
||||
, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice
|
||||
, ktextwidgets, kwidgetsaddons, kxmlgui
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kparts";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [
|
||||
kconfig kcoreaddons kiconthemes kjobwidgets knotifications
|
||||
kservice kwidgetsaddons
|
||||
];
|
||||
propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n
|
||||
, kitemviews, kservice, kwidgetsaddons, qtdeclarative
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kpeople";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [
|
||||
kcoreaddons kitemviews kservice kwidgetsaddons
|
||||
];
|
||||
propagatedBuildInputs = [ ki18n qtdeclarative ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kplotting";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }:
|
||||
|
||||
kdeFramework {
|
||||
name = "kpty";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
propagatedBuildInputs = [ kcoreaddons ki18n ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons
|
||||
, kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons
|
||||
, kxmlgui, qtscript
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kross";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [ kcompletion kcoreaddons kxmlgui ];
|
||||
propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
|
||||
, ki18n, kio, kservice, plasma-framework, qtquick1, solid
|
||||
, threadweaver
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "krunner";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [
|
||||
kconfig kcoreaddons kservice qtquick1 solid threadweaver
|
||||
];
|
||||
propagatedBuildInputs = [ ki18n kio plasma-framework ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Wed, 14 Oct 2015 06:28:57 -0500
|
||||
Subject: [PATCH 1/2] qdiriterator follow symlinks
|
||||
|
||||
---
|
||||
src/sycoca/kbuildsycoca.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp
|
||||
index 1deae14..250baa8 100644
|
||||
--- a/src/sycoca/kbuildsycoca.cpp
|
||||
+++ b/src/sycoca/kbuildsycoca.cpp
|
||||
@@ -208,7 +208,7 @@ bool KBuildSycoca::build()
|
||||
QStringList relFiles;
|
||||
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_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...
|
||||
--
|
||||
2.5.2
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Wed, 14 Oct 2015 06:31:29 -0500
|
||||
Subject: [PATCH 2/2] no canonicalize path
|
||||
|
||||
---
|
||||
src/sycoca/vfolder_menu.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp
|
||||
index d3e31c3..d15d743 100644
|
||||
--- a/src/sycoca/vfolder_menu.cpp
|
||||
+++ b/src/sycoca/vfolder_menu.cpp
|
||||
@@ -415,7 +415,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;
|
||||
}
|
||||
--
|
||||
2.5.2
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
|
||||
, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kservice";
|
||||
setupHook = ./setup-hook.sh;
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [ kcrash kdbusaddons ];
|
||||
propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ];
|
||||
propagatedUserEnvPkgs = [ kcoreaddons ];
|
||||
patches = [
|
||||
./0001-qdiriterator-follow-symlinks.patch
|
||||
./0002-no-canonicalize-path.patch
|
||||
];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
addServicePkg() {
|
||||
local propagated
|
||||
for dir in "share/kservices5" "share/kservicetypes5"; do
|
||||
if [[ -d "$1/$dir" ]]; then
|
||||
propagated=
|
||||
for pkg in $propagatedBuildInputs; do
|
||||
if [[ "z$pkg" == "z$1" ]]; then
|
||||
propagated=1
|
||||
break
|
||||
fi
|
||||
done
|
||||
if [[ -z $propagated ]]; then
|
||||
propagatedBuildInputs="$propagatedBuildInputs $1"
|
||||
fi
|
||||
|
||||
propagated=
|
||||
for pkg in $propagatedUserEnvPkgs; do
|
||||
if [[ "z$pkg" == "z$1" ]]; then
|
||||
propagated=1
|
||||
break
|
||||
fi
|
||||
done
|
||||
if [[ -z $propagated ]]; then
|
||||
propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
|
||||
fi
|
||||
|
||||
break
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
envHooks+=(addServicePkg)
|
||||
|
||||
local propagated
|
||||
for pkg in $propagatedBuildInputs; do
|
||||
if [[ "z$pkg" == "z@out@" ]]; then
|
||||
propagated=1
|
||||
break
|
||||
fi
|
||||
done
|
||||
if [[ -z $propagated ]]; then
|
||||
propagatedBuildInputs="$propagatedBuildInputs @out@"
|
||||
fi
|
||||
@ -1,48 +0,0 @@
|
||||
From dc50fffdc72b76498384ce2f9065c3757b786d71 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Wed, 14 Oct 2015 09:08:59 -0500
|
||||
Subject: [PATCH] no qcoreapplication
|
||||
|
||||
---
|
||||
src/syntax/data/katehighlightingindexer.cpp | 11 ++++-------
|
||||
1 file changed, 4 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp
|
||||
index 3c63140..e3d5efe 100644
|
||||
--- a/src/syntax/data/katehighlightingindexer.cpp
|
||||
+++ b/src/syntax/data/katehighlightingindexer.cpp
|
||||
@@ -51,19 +51,16 @@ QStringList readListing(const QString &fileName)
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
- // get app instance
|
||||
- QCoreApplication app(argc, argv);
|
||||
-
|
||||
// ensure enough arguments are passed
|
||||
- if (app.arguments().size() < 3)
|
||||
+ if (argc < 3)
|
||||
return 1;
|
||||
|
||||
// open schema
|
||||
QXmlSchema schema;
|
||||
- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
|
||||
+ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
|
||||
return 2;
|
||||
|
||||
- const QString hlFilenamesListing = app.arguments().value(3);
|
||||
+ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
|
||||
if (hlFilenamesListing.isEmpty()) {
|
||||
return 1;
|
||||
}
|
||||
@@ -147,7 +144,7 @@ int main(int argc, char *argv[])
|
||||
return anyError;
|
||||
|
||||
// create outfile, after all has worked!
|
||||
- QFile outFile(app.arguments().at(1));
|
||||
+ QFile outFile(QString::fromLocal8Bit(argv[1]));
|
||||
if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
|
||||
return 7;
|
||||
|
||||
--
|
||||
2.5.2
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, karchive, kconfig
|
||||
, kguiaddons, ki18n, kio, kiconthemes, kparts, perl, qtscript
|
||||
, qtxmlpatterns, sonnet
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "ktexteditor";
|
||||
nativeBuildInputs = [ extra-cmake-modules perl ];
|
||||
buildInputs = [
|
||||
karchive kconfig kguiaddons kiconthemes kparts qtscript
|
||||
qtxmlpatterns
|
||||
];
|
||||
propagatedBuildInputs = [ ki18n kio sonnet ];
|
||||
patches = [ ./0001-no-qcoreapplication.patch ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
|
||||
, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem
|
||||
, sonnet
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "ktextwidgets";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [
|
||||
kcompletion kconfig kconfigwidgets kiconthemes kservice
|
||||
];
|
||||
propagatedBuildInputs = [ ki18n kwindowsystem sonnet ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, ki18n }:
|
||||
|
||||
kdeFramework {
|
||||
name = "kunitconversion";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
propagatedBuildInputs = [ ki18n ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,21 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
|
||||
, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications
|
||||
, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeQtWrapper
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kwallet";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
|
||||
buildInputs = [
|
||||
kconfig kcoreaddons kdbusaddons kiconthemes knotifications
|
||||
kservice kwidgetsaddons libgcrypt
|
||||
];
|
||||
propagatedBuildInputs = [ ki18n kwindowsystem ];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/kwalletd5"
|
||||
wrapQtProgram "$out/bin/kwallet-query"
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kwidgetsaddons";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, qtx11extras
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kwindowsystem";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ qtx11extras ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,18 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, attica, kconfig
|
||||
, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews
|
||||
, ktextwidgets, kwindowsystem, sonnet
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kxmlgui";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [
|
||||
attica kconfig kiconthemes kitemviews ktextwidgets
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
kconfigwidgets kglobalaccel ki18n kwindowsystem sonnet
|
||||
];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }:
|
||||
|
||||
kdeFramework {
|
||||
name = "kxmlrpcclient";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
propagatedBuildInputs = [ ki18n kio ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, modemmanager
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "modemmanager-qt";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
propagatedBuildInputs = [ modemmanager ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, networkmanager
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "networkmanager-qt";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
propagatedBuildInputs = [ networkmanager ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
{ kdeFramework
|
||||
, lib
|
||||
, extra-cmake-modules
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "oxygen-icons5";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
meta = {
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
{ kdeFramework, lib, extra-cmake-modules, kactivities, karchive
|
||||
, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
|
||||
, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
|
||||
, knotifications, kpackage, kservice, kwindowsystem, kxmlgui
|
||||
, makeQtWrapper, qtscript, qtx11extras
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "plasma-framework";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
|
||||
buildInputs = [
|
||||
karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons
|
||||
kiconthemes knotifications kxmlgui qtscript
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem
|
||||
qtx11extras
|
||||
];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/plasmapkg2"
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, makeQtWrapper
|
||||
, qtdeclarative
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "solid";
|
||||
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
|
||||
buildInputs = [ qtdeclarative ];
|
||||
postInstall = ''
|
||||
wrapQtProgram "$out/bin/solid-hardware5"
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
, hunspell
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "sonnet";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ hunspell ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -1,565 +0,0 @@
|
||||
# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
|
||||
{ fetchurl, mirror }:
|
||||
|
||||
{
|
||||
attica = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/attica-5.16.0.tar.xz";
|
||||
sha256 = "1739pf892vgvl03l4322p09p346ca4nghc50ansny7868c73f95w";
|
||||
name = "attica-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
baloo = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/baloo-5.16.0.tar.xz";
|
||||
sha256 = "0s8l9q43ak87sjagashxfwadildlz3vdysj96in6v3gcg09ngm8j";
|
||||
name = "baloo-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
bluez-qt = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/bluez-qt-5.16.0.tar.xz";
|
||||
sha256 = "0xxlwb4kqiiqmph9vr6ppyzjndzz1ys9qbnzzinrhhdmiir5m3k6";
|
||||
name = "bluez-qt-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-icons = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/breeze-icons-5.16.0.tar.xz";
|
||||
sha256 = "1vmwnqin9p6p78kshn1bfq7zz1znmm615bq28545shywfkri1yil";
|
||||
name = "breeze-icons-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
extra-cmake-modules = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/extra-cmake-modules-5.16.0.tar.xz";
|
||||
sha256 = "06xfmxbjkrdswh2n0qmdi5zvm3dqhawiazi5x6p32n77ij5wiph9";
|
||||
name = "extra-cmake-modules-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
frameworkintegration = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/frameworkintegration-5.16.0.tar.xz";
|
||||
sha256 = "0vyv3c34mpp6yjgqm8gyir7cwxn3a064q5d3ms49macpjkkz7c6f";
|
||||
name = "frameworkintegration-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kactivities = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kactivities-5.16.0.tar.xz";
|
||||
sha256 = "0aq0yxbzhg3r9jpddn1vnylmjb2xr4xx5rviisyfa6nhn21ynqxm";
|
||||
name = "kactivities-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kapidox = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kapidox-5.16.0.tar.xz";
|
||||
sha256 = "0gfxnssbkdkfncka956y5d2w3zm7yxkl11jvl88cwg6zx2rfh1a4";
|
||||
name = "kapidox-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
karchive = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/karchive-5.16.0.tar.xz";
|
||||
sha256 = "0rn8n7lnw9z7rl1d2cdy59j4f38jzd6sj0s33dkfk04i4kl0ccpc";
|
||||
name = "karchive-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kauth = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kauth-5.16.0.tar.xz";
|
||||
sha256 = "1972c4m7kcj7hnklvy973935sn0khl4jby6g8q2i5hzivp5b0sn3";
|
||||
name = "kauth-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kbookmarks = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kbookmarks-5.16.0.tar.xz";
|
||||
sha256 = "009yls3f4l97z1hcn9nk0j35b0kfysc2l0gvdnijk9prgldn287j";
|
||||
name = "kbookmarks-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcmutils = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kcmutils-5.16.0.tar.xz";
|
||||
sha256 = "1cz3lgwm6vp39c40yykg26791xcjk3vr83266nhcyl6cm7dk04rl";
|
||||
name = "kcmutils-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcodecs = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kcodecs-5.16.0.tar.xz";
|
||||
sha256 = "164yj6mpqb7hl9v5xdhgwpddrk7d4qig8qhx9i8xlxbb2v30rlcp";
|
||||
name = "kcodecs-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcompletion = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kcompletion-5.16.0.tar.xz";
|
||||
sha256 = "084nqd5j7rffqh67v862h88zsqks3pyynw2fzmayhngcjm1y8c22";
|
||||
name = "kcompletion-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kconfig = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kconfig-5.16.0.tar.xz";
|
||||
sha256 = "1871ixmk4z4ajfnszlyba4ibmywz0iw7ibg073wwzm3hpx2nizmf";
|
||||
name = "kconfig-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kconfigwidgets = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kconfigwidgets-5.16.0.tar.xz";
|
||||
sha256 = "11pl9295qnvz9284liyacz87hb5w5a4ybzcyg0jchc62aw1q9bi6";
|
||||
name = "kconfigwidgets-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcoreaddons = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kcoreaddons-5.16.0.tar.xz";
|
||||
sha256 = "1944csk50q42a2prm6fijnzi1cds23phdzkfvsxlxxxzga7744fm";
|
||||
name = "kcoreaddons-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcrash = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kcrash-5.16.0.tar.xz";
|
||||
sha256 = "1bk7dvlzxs6n63iy0lmb7jgwa3np0ja4ldvwxx1y82gq593dqwa9";
|
||||
name = "kcrash-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdbusaddons = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kdbusaddons-5.16.0.tar.xz";
|
||||
sha256 = "0ykfgmhisyiah9nisb73xcdfnxgiwcpjzry68x9j1r60b506r6za";
|
||||
name = "kdbusaddons-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdeclarative = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kdeclarative-5.16.0.tar.xz";
|
||||
sha256 = "0ck8w2vd9z288h08zc8fa2bndgcg6m63g34dl95snb4h00ciybd4";
|
||||
name = "kdeclarative-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kded = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kded-5.16.0.tar.xz";
|
||||
sha256 = "0p0mxa989k9n45iaq0ymgr228nx4g31v3bcbdm2vlzzr524jnx8q";
|
||||
name = "kded-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdelibs4support = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/portingAids/kdelibs4support-5.16.0.tar.xz";
|
||||
sha256 = "0y2m67h79in7hdlv95g31kkdnjafdda1h26dm9fdjv52183n8kdc";
|
||||
name = "kdelibs4support-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdesignerplugin = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kdesignerplugin-5.16.0.tar.xz";
|
||||
sha256 = "1x2kd70nyvykcmd4whnv991pqyflpaahans5jaz0v0y1a2l67965";
|
||||
name = "kdesignerplugin-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdesu = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kdesu-5.16.0.tar.xz";
|
||||
sha256 = "10g7vg8q2hibdh098n373jg8njzr0w9dxyfi9yb84pjyyshj7km6";
|
||||
name = "kdesu-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdewebkit = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kdewebkit-5.16.0.tar.xz";
|
||||
sha256 = "1nq6j1k3ddp9p40mdgczcvv0ba16haz3s4km9pyxsv7qwrbpm6wa";
|
||||
name = "kdewebkit-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdnssd = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kdnssd-5.16.0.tar.xz";
|
||||
sha256 = "1ds1xvw7v75vz2nnrygy10slwysis75y57s8xafsw7fhs8sybvc3";
|
||||
name = "kdnssd-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdoctools = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kdoctools-5.16.0.tar.xz";
|
||||
sha256 = "1qf82drggsbhwlwsrmwbk6m0x4jhihhx0wz32y7ybhn867p8glgb";
|
||||
name = "kdoctools-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kemoticons = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kemoticons-5.16.0.tar.xz";
|
||||
sha256 = "166la4160vjf444cylyr4dnc507fqsifl9qpdw2gqa8nw45w6kms";
|
||||
name = "kemoticons-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kfilemetadata = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kfilemetadata-5.16.0.tar.xz";
|
||||
sha256 = "1yf7hgpgrvw8qvyj0l8c828y6xh3w3grslg4s9grx93jsw2jpypm";
|
||||
name = "kfilemetadata-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kglobalaccel = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kglobalaccel-5.16.0.tar.xz";
|
||||
sha256 = "12hxhi8b53az3qrpgcjz494vylbqgxq3921qhsccy3nvywg7r3mv";
|
||||
name = "kglobalaccel-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kguiaddons = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kguiaddons-5.16.0.tar.xz";
|
||||
sha256 = "1gv0rhr06xzgkw1pj1nc4jbc6vmr952bbvs1vp3x2609pfn7d8b4";
|
||||
name = "kguiaddons-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
khtml = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/portingAids/khtml-5.16.0.tar.xz";
|
||||
sha256 = "11q66h7hlsmjc7rj4m70yian6vymbjisz7yw7ck81qbv7b75w9bk";
|
||||
name = "khtml-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
ki18n = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/ki18n-5.16.0.tar.xz";
|
||||
sha256 = "08hxinx0x8b4pprx23a6aklc9sd26cd21ajdzlk2wrv8jp3dl2pw";
|
||||
name = "ki18n-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kiconthemes = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kiconthemes-5.16.0.tar.xz";
|
||||
sha256 = "10y9rz4dmza6xjl8n9hhjpymnxzpdqk6w82s7d4yaam2kkv5hysk";
|
||||
name = "kiconthemes-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kidletime = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kidletime-5.16.0.tar.xz";
|
||||
sha256 = "1s51xbn2i50d7dpl7p9aq92gy5zvgxb0liaq36f425g3hzmdkr57";
|
||||
name = "kidletime-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kimageformats = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kimageformats-5.16.0.tar.xz";
|
||||
sha256 = "02jsmz3ysddywd9v7y8cbsvanpg4d9xwbgr0sqxb600a4s0z797s";
|
||||
name = "kimageformats-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kinit = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kinit-5.16.0.tar.xz";
|
||||
sha256 = "1flpxypblj7jjv854f81xd6yx3x1wsns18hpp19jnwb54w2xy0g0";
|
||||
name = "kinit-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kio = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kio-5.16.0.tar.xz";
|
||||
sha256 = "1mm94ywvkfnrfkd29vhcnc8v3ly9d33vvjmrhz9r2q3rw4zyjpiv";
|
||||
name = "kio-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kitemmodels = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kitemmodels-5.16.0.tar.xz";
|
||||
sha256 = "1bm948adzhqpq698wg1bqxz09cmpxwqhpv1qvb6fgnxv2fyjgdg2";
|
||||
name = "kitemmodels-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kitemviews = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kitemviews-5.16.0.tar.xz";
|
||||
sha256 = "1bv41lijf3yh2dwwkwjp80sxz5yffyl1hqs7prhhv2jyn88xpx6a";
|
||||
name = "kitemviews-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kjobwidgets = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kjobwidgets-5.16.0.tar.xz";
|
||||
sha256 = "07dclwc85294ca3vkg1sf9zqcgr3brzjimb8qqy0svdbfvbr0kxa";
|
||||
name = "kjobwidgets-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kjs = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/portingAids/kjs-5.16.0.tar.xz";
|
||||
sha256 = "0zj5px9wx5c5yzlsz48bahi0xnshn3xbrfm4l9j4x4nj4vk3jksv";
|
||||
name = "kjs-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kjsembed = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/portingAids/kjsembed-5.16.0.tar.xz";
|
||||
sha256 = "17vsbz0a6cd0nfjpwlyr6401pfrz0snxrcqwnj0llcmbpkbc3las";
|
||||
name = "kjsembed-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kmediaplayer = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/portingAids/kmediaplayer-5.16.0.tar.xz";
|
||||
sha256 = "0j9g13qd7l2kwn1imphdsannjdxbx3jk8jl3d9xa6g33mqav8bjc";
|
||||
name = "kmediaplayer-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
knewstuff = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/knewstuff-5.16.0.tar.xz";
|
||||
sha256 = "0213lnnlah2jq8a5rbbwzjxl0qc0cgmsnixjbkbvq3wr7yb1s6hr";
|
||||
name = "knewstuff-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
knotifications = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/knotifications-5.16.0.tar.xz";
|
||||
sha256 = "0bfr68a2favrnmpmck16vrqy8mni72plkn0fv0fl6bfq3fmi645a";
|
||||
name = "knotifications-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
knotifyconfig = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/knotifyconfig-5.16.0.tar.xz";
|
||||
sha256 = "0ma5s4451h9jl9va4nnjrwhxgq5jmgq2b0m5y7hdh7m03hwhjqmc";
|
||||
name = "knotifyconfig-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kpackage = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kpackage-5.16.0.tar.xz";
|
||||
sha256 = "0js7dbg0y6b6nqnwc70706pchxpg12l9g7si1qab2jq8ir5drrap";
|
||||
name = "kpackage-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kparts = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kparts-5.16.0.tar.xz";
|
||||
sha256 = "0g405r2x900d8c5jdsspy05m70agj3gqja6y3j319b8ph3yycnq4";
|
||||
name = "kparts-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kpeople = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kpeople-5.16.0.tar.xz";
|
||||
sha256 = "07lsacynsr3mzqyizbq3mywk8d54kyzfx5a3nminf2hs5a1wgg8m";
|
||||
name = "kpeople-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kplotting = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kplotting-5.16.0.tar.xz";
|
||||
sha256 = "1fc448f52lf8nvs2zi2r55vqfhph7qdvdwvdpk0gz8jadj4gciz7";
|
||||
name = "kplotting-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kpty = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kpty-5.16.0.tar.xz";
|
||||
sha256 = "074sws3rvjs090l2cbhl9gxcgb6bjlxard8ylmrkhvqr0dc9syvc";
|
||||
name = "kpty-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kross = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/portingAids/kross-5.16.0.tar.xz";
|
||||
sha256 = "05mwldy2jwal5pjn6hbiny61xd02sbljkkbyc33ni5qiiznxjk56";
|
||||
name = "kross-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
krunner = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/portingAids/krunner-5.16.0.tar.xz";
|
||||
sha256 = "1rk7j6kj3sv6dqnv98hprdyrp94wz57lr1lvlmw11kdlm1mmh45p";
|
||||
name = "krunner-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kservice = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kservice-5.16.0.tar.xz";
|
||||
sha256 = "140b4jxs3s00xbbbh8jjqw9q5krsd7xh4qal2k0hjk0nfx5blvp9";
|
||||
name = "kservice-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
ktexteditor = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/ktexteditor-5.16.0.tar.xz";
|
||||
sha256 = "0g1yms864jq83c48j5ida4pmwisqxn49kl5daf7c1ssaia1pxfqw";
|
||||
name = "ktexteditor-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
ktextwidgets = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/ktextwidgets-5.16.0.tar.xz";
|
||||
sha256 = "1vzklpq1zdn3cg5hh7f2988q3sdn6y9mr1hgkmpcsc1y8pfhn7w9";
|
||||
name = "ktextwidgets-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kunitconversion = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kunitconversion-5.16.0.tar.xz";
|
||||
sha256 = "1ppmma1z1hk9shfn1w7dvy72872ryyqs9252s65pzx3ycrd00nll";
|
||||
name = "kunitconversion-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwallet = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kwallet-5.16.0.tar.xz";
|
||||
sha256 = "1gcwc7m8q5ya3gbj02pmmjaigpr0y94m3h526b2xdbksc23kv2gi";
|
||||
name = "kwallet-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwidgetsaddons = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kwidgetsaddons-5.16.0.tar.xz";
|
||||
sha256 = "0vzyikwp351sdywh38m6jj851sf5l4s8mxyvf5i6jkzpzl5591a3";
|
||||
name = "kwidgetsaddons-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwindowsystem = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kwindowsystem-5.16.0.tar.xz";
|
||||
sha256 = "07hl0sy0573nwddzyph5s75h983569p5bb96gxjbh0lh3ixar2ig";
|
||||
name = "kwindowsystem-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kxmlgui = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kxmlgui-5.16.0.tar.xz";
|
||||
sha256 = "1vzhf29gd5kn94x1cydnblb5v5163a52vpwh7fpsg3dlhhwd9h2s";
|
||||
name = "kxmlgui-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kxmlrpcclient = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/kxmlrpcclient-5.16.0.tar.xz";
|
||||
sha256 = "1pacf0q67xckw8nvj3bncz5ydsmiw2a0fksmabklpbdmi9p2dz0a";
|
||||
name = "kxmlrpcclient-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
modemmanager-qt = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/modemmanager-qt-5.16.0.tar.xz";
|
||||
sha256 = "0q135rhp52pk3ilmx9gx2cmn2p834s56kcqg3vdfycvi5gmvn81x";
|
||||
name = "modemmanager-qt-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
networkmanager-qt = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/networkmanager-qt-5.16.0.tar.xz";
|
||||
sha256 = "115r211bf16dlcccib6dg0fd22g9kq9xshh8vf7f4msaa63kdfjv";
|
||||
name = "networkmanager-qt-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
oxygen-icons5 = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/oxygen-icons5-5.16.0.tar.xz";
|
||||
sha256 = "0nmr1jp3kr41k4wn9jvj1yvq9w51ljajzk94qf5k7rh68dzj4jl7";
|
||||
name = "oxygen-icons5-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-framework = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/plasma-framework-5.16.0.tar.xz";
|
||||
sha256 = "1snih6i9n29c48sfw51csl99khps1c9bralb599d3c6q1j4iqzp3";
|
||||
name = "plasma-framework-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
solid = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/solid-5.16.0.tar.xz";
|
||||
sha256 = "1km4nb8cmqag2lpwgrmjj5rn8lv6s9lbhh2d3dfb2f0lmnqm00sl";
|
||||
name = "solid-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
sonnet = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/sonnet-5.16.0.tar.xz";
|
||||
sha256 = "1fn729ijclvdrxw9h0c23sbayfagh2jb7yglgsqqjsg3bdp72qi7";
|
||||
name = "sonnet-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
threadweaver = {
|
||||
version = "5.16.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.16/threadweaver-5.16.0.tar.xz";
|
||||
sha256 = "1ansjzfl6bvwqw2yi597gvzikyaaf8z5pvldwfd4mamb3vl42y4y";
|
||||
name = "threadweaver-5.16.0.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
{ kdeFramework, lib
|
||||
, extra-cmake-modules
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "threadweaver";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
@ -6845,10 +6845,9 @@ let
|
||||
};
|
||||
|
||||
kf515 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.15 { inherit pkgs; });
|
||||
kf516 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.16 { inherit pkgs; });
|
||||
kf517 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; });
|
||||
kf5_stable = kf515;
|
||||
kf5_latest = kf516;
|
||||
kf5_latest = kf517;
|
||||
|
||||
kf5PackagesFun = self: with self; {
|
||||
|
||||
@ -6891,6 +6890,7 @@ let
|
||||
};
|
||||
|
||||
kf515Packages = lib.makeScope kf515.newScope kf5PackagesFun;
|
||||
kf517Packages = lib.makeScope kf517.newScope kf5PackagesFun;
|
||||
kf5Packages = kf515Packages;
|
||||
|
||||
kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user